diff --git a/client/src/app/domain/models/meeting-users/meeting-user.ts b/client/src/app/domain/models/meeting-users/meeting-user.ts
index 29169c6bf1..c3743d54f4 100644
--- a/client/src/app/domain/models/meeting-users/meeting-user.ts
+++ b/client/src/app/domain/models/meeting-users/meeting-user.ts
@@ -18,6 +18,7 @@ export class MeetingUser extends BaseDecimalModel<MeetingUser> {
 
     public vote_delegated_to_id!: Id; // meeting_user/vote_delegations_from_ids;
 
+    public poll_voted_ids: Id[];
     public group_ids!: Id[]; // (group/meeting_user_ids)[];
     public speaker_ids!: Id[]; // (speaker/meeting_user_id)[];
     public personal_note_ids!: Id[]; // (personal_note/meeting_user_id)[];
@@ -52,6 +53,7 @@ export class MeetingUser extends BaseDecimalModel<MeetingUser> {
         `assignment_candidate_ids`,
         `vote_delegated_to_id`,
         `vote_delegations_from_ids`,
+        `poll_voted_ids`,
         `chat_message_ids`,
         `group_ids`,
         `structure_level_ids`
diff --git a/client/src/app/domain/models/meetings/meeting.ts b/client/src/app/domain/models/meetings/meeting.ts
index d01d8dd3f8..a831ee40eb 100644
--- a/client/src/app/domain/models/meetings/meeting.ts
+++ b/client/src/app/domain/models/meetings/meeting.ts
@@ -4,7 +4,8 @@ import { HasProperties } from '../../interfaces/has-properties';
 import { AgendaItemCreation, AgendaItemType } from '../agenda/agenda-item';
 import { BaseModel } from '../base/base-model';
 import { ChangeRecoMode, LineNumberingMode } from '../motions/motions.constants';
-import { PollBackendDurationType, PollMethod, PollPercentBase, PollType } from '../poll/poll-constants';
+import { PollVisibility } from '../poll';
+import { BaseOnehundredPercentBase } from '../poll/poll-config-types';
 import { ApplauseType } from './applause';
 import {
     BallotPaperSelection,
@@ -146,11 +147,9 @@ export class Settings {
 
     public motion_poll_ballot_paper_selection!: BallotPaperSelection;
     public motion_poll_ballot_paper_number!: number;
-    public motion_poll_default_type!: PollType;
-    public motion_poll_default_onehundred_percent_base!: PollPercentBase;
+    public motion_poll_default_type!: PollVisibility;
+    public motion_poll_default_onehundred_percent_base!: BaseOnehundredPercentBase;
     public motion_poll_default_group_ids!: Id[]; // (group/used_as_motion_poll_default_id)[];
-    public motion_poll_default_backend!: PollBackendDurationType;
-    public motion_poll_default_method!: PollMethod;
     public motion_poll_projection_name_order_first!: `first_name` | `last_name`;
     public motion_poll_projection_max_columns!: number;
 
@@ -182,11 +181,9 @@ export class Settings {
     public assignment_poll_add_candidates_to_list_of_speakers!: boolean;
     public assignment_poll_enable_max_votes_per_option!: boolean;
     public assignment_poll_sort_poll_result_by_votes!: boolean;
-    public assignment_poll_default_type!: PollType;
-    public assignment_poll_default_method!: PollMethod;
-    public assignment_poll_default_onehundred_percent_base!: PollPercentBase;
+    public assignment_poll_default_type!: PollVisibility;
+    public assignment_poll_default_onehundred_percent_base!: BaseOnehundredPercentBase;
     public assignment_poll_default_group_ids!: Id[]; // (group/used_as_assignment_poll_default_id)[];
-    public assignment_poll_default_backend!: PollBackendDurationType;
 
     // topic poll
     public topic_poll_default_group_ids: Id[]; // (group/used_as_poll_default_id)[];
@@ -195,11 +192,9 @@ export class Settings {
     public poll_ballot_paper_selection: BallotPaperSelection;
     public poll_ballot_paper_number: number;
     public poll_sort_poll_result_by_votes: boolean;
-    public poll_default_type: PollType;
-    public poll_default_method: PollMethod;
-    public poll_default_onehundred_percent_base: PollPercentBase;
+    public poll_default_type: PollVisibility;
+    public poll_default_onehundred_percent_base: BaseOnehundredPercentBase;
     public poll_default_group_ids: Id[]; // (group/used_as_poll_default_id)[];
-    public poll_default_backend: PollBackendDurationType;
     public poll_default_live_voting_enabled: boolean;
 
     // SSO
@@ -412,14 +407,10 @@ export class Meeting extends BaseModel<Meeting> {
         `motion_poll_ballot_paper_selection`,
         `motion_poll_ballot_paper_number`,
         `motion_poll_default_type`,
-        `motion_poll_default_method`,
         `motion_poll_default_onehundred_percent_base`,
         `motion_poll_default_group_ids`,
-        `motion_poll_default_backend`,
         `motion_poll_projection_name_order_first`,
         `motion_poll_projection_max_columns`,
-        `poll_candidate_list_ids`,
-        `poll_candidate_ids`,
         `meeting_user_ids`,
         `users_enable_presence_view`,
         `users_enable_vote_weight`,
@@ -446,18 +437,14 @@ export class Meeting extends BaseModel<Meeting> {
         `assignment_poll_enable_max_votes_per_option`,
         `assignment_poll_sort_poll_result_by_votes`,
         `assignment_poll_default_type`,
-        `assignment_poll_default_method`,
         `assignment_poll_default_onehundred_percent_base`,
         `assignment_poll_default_group_ids`,
-        `assignment_poll_default_backend`,
         `poll_ballot_paper_selection`,
         `poll_ballot_paper_number`,
         `poll_sort_poll_result_by_votes`,
         `poll_default_type`,
-        `poll_default_method`,
         `poll_default_onehundred_percent_base`,
         `poll_default_group_ids`,
-        `poll_default_backend`,
         `poll_default_live_voting_enabled`,
         `topic_poll_default_group_ids`,
         `projector_ids`,
@@ -488,8 +475,6 @@ export class Meeting extends BaseModel<Meeting> {
         `motion_change_recommendation_ids`,
         `motion_state_ids`,
         `poll_ids`,
-        `option_ids`,
-        `vote_ids`,
         `assignment_ids`,
         `assignment_candidate_ids`,
         `personal_note_ids`,
diff --git a/client/src/app/domain/models/poll-candidate-lists/poll-candidate-list.ts b/client/src/app/domain/models/poll-candidate-lists/poll-candidate-list.ts
deleted file mode 100644
index fbfeff3909..0000000000
--- a/client/src/app/domain/models/poll-candidate-lists/poll-candidate-list.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Id } from '../../definitions/key-types';
-import { HasMeetingId } from '../../interfaces';
-import { BaseModel } from '../base/base-model';
-
-export class PollCandidateList extends BaseModel<PollCandidateList> {
-    public static COLLECTION = `poll_candidate_list`;
-
-    public option_id!: Id; // option/content_object_id;
-    public poll_candidate_ids!: Id[]; // poll_candidate/poll_candidate_list_id;
-
-    public constructor(input?: any) {
-        super(PollCandidateList.COLLECTION, input);
-    }
-
-    public static readonly REQUESTABLE_FIELDS: (keyof PollCandidateList)[] = [
-        `id`,
-        `poll_candidate_ids`,
-        `meeting_id`,
-        `option_id`
-    ];
-}
-export interface PollCandidateList extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll-candidate-lists/poll-candidate.ts b/client/src/app/domain/models/poll-candidate-lists/poll-candidate.ts
deleted file mode 100644
index 5b879d2774..0000000000
--- a/client/src/app/domain/models/poll-candidate-lists/poll-candidate.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Id } from '../../definitions/key-types';
-import { HasMeetingId } from '../../interfaces';
-import { BaseModel } from '../base/base-model';
-
-export class PollCandidate extends BaseModel<PollCandidate> {
-    public static COLLECTION = `poll_candidate`;
-
-    public weight!: number;
-
-    public poll_candidate_list_id!: Id; // poll_candidate_list/poll_candidate_ids;
-    public user_id!: Id; // user/poll_candidate_ids;
-
-    public constructor(input?: any) {
-        super(PollCandidate.COLLECTION, input);
-    }
-
-    public static readonly REQUESTABLE_FIELDS: (keyof PollCandidate)[] = [
-        `id`,
-        `poll_candidate_list_id`,
-        `user_id`,
-        `weight`,
-        `meeting_id`
-    ];
-}
-export interface PollCandidate extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/ballot.ts b/client/src/app/domain/models/poll/ballot.ts
new file mode 100644
index 0000000000..343f5ee6f7
--- /dev/null
+++ b/client/src/app/domain/models/poll/ballot.ts
@@ -0,0 +1,41 @@
+import { Id } from '../../definitions/key-types';
+import { HasMeetingId } from '../../interfaces';
+import { BaseModel } from '../base/base-model';
+import { VoteValue, VoteValueVerbose } from './vote-constants';
+
+export class Ballot extends BaseModel<Ballot> {
+    public static COLLECTION = `ballot`;
+
+    public weight: number;
+    public split: boolean;
+    public value: VoteValue;
+
+    public poll_id!: Id;
+    public acting_meeting_user_id: Id;
+    public represented_meeting_user_id: Id;
+
+    public get valueVerbose(): string {
+        return VoteValueVerbose[this.value];
+    }
+
+    public constructor(input?: Partial<Ballot>) {
+        super(Ballot.COLLECTION, input);
+    }
+
+    protected getDecimalFields(): string[] {
+        return [`weight`];
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof Ballot)[] = [
+        `id`,
+        `weight`,
+        `split`,
+        `value`,
+        `meeting_id`,
+        `poll_id`,
+        `acting_meeting_user_id`,
+        `represented_meeting_user_id`
+    ];
+}
+
+export interface Ballot extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/base-poll-config.ts b/client/src/app/domain/models/poll/base-poll-config.ts
new file mode 100644
index 0000000000..0b4fa7c023
--- /dev/null
+++ b/client/src/app/domain/models/poll/base-poll-config.ts
@@ -0,0 +1,6 @@
+import { Id } from '../../definitions/key-types';
+import { BaseModel } from '../base/base-model';
+
+export abstract class BasePollConfigModel<T = any> extends BaseModel<T> {
+    public poll_id!: Id;
+}
diff --git a/client/src/app/domain/models/poll/generic-poll.ts b/client/src/app/domain/models/poll/generic-poll.ts
index b35cdefc33..55cb09439a 100644
--- a/client/src/app/domain/models/poll/generic-poll.ts
+++ b/client/src/app/domain/models/poll/generic-poll.ts
@@ -1,11 +1,7 @@
-import { Observable } from 'rxjs';
 import { ViewTopic } from 'src/app/site/pages/meetings/pages/agenda';
 import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
 import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions';
-import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-
-import { EntitledUsersEntry, PollClassType, PollMethod, PollPercentBase, PollState, PollType } from './poll-constants';
+import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
 
 export type PollContentObject = ViewAssignment | ViewMotion | ViewTopic;
 
@@ -14,27 +10,6 @@ export type PollContentObject = ViewAssignment | ViewMotion | ViewTopic;
  * This is a unification of the data received in the projector and ViewPoll; both
  * use this interface, so the poll services can work on this shared view on the data.
  */
-export interface PollData {
-    pollClassType?: PollClassType;
-    pollmethod: PollMethod;
-    state: PollState;
-    onehundred_percent_base: PollPercentBase;
-    votesvalid: number;
-    votesinvalid: number;
-    votescast: number;
-    type: PollType;
-    entitled_users_at_stop: EntitledUsersEntry[];
-    options: OptionData[];
-    options$: Observable<OptionData[]>;
-    global_option: OptionData;
-    global_yes?: boolean;
-    global_no?: boolean;
-    global_abstain?: boolean;
-    content_object?: PollContentObject;
-    getContentObjectTitle: () => string | null;
-}
-
-export type PollDataKey = keyof PollData;
 
 export interface OptionTitle {
     title: string;
@@ -53,7 +28,8 @@ export interface OptionData {
     amount_global_yes?: number;
     amount_global_no?: number;
     amount_global_abstain?: number;
-    content_object?: ViewUser | ViewMotion | ViewPollCandidateList;
+    meeting_user?: ViewMeetingUser;
+    text?: string;
     entries_amount?: number;
 }
 
diff --git a/client/src/app/domain/models/poll/index.ts b/client/src/app/domain/models/poll/index.ts
index 316a36a5fe..a379463e24 100644
--- a/client/src/app/domain/models/poll/index.ts
+++ b/client/src/app/domain/models/poll/index.ts
@@ -1,6 +1,5 @@
+export * from './ballot';
 export * from './generic-poll';
-export * from './option';
 export * from './poll';
 export * from './poll-constants';
-export * from './vote';
 export * from './vote-constants';
diff --git a/client/src/app/domain/models/poll/option.ts b/client/src/app/domain/models/poll/option.ts
deleted file mode 100644
index afd8cd32dc..0000000000
--- a/client/src/app/domain/models/poll/option.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Fqid, Id, Ids } from '../../definitions/key-types';
-import { BaseDecimalModel } from '../base/base-decimal-model';
-
-export class Option extends BaseDecimalModel<Option> {
-    public static COLLECTION = `option`;
-    public static readonly DECIMAL_FIELDS: (keyof Option)[] = [`yes`, `no`, `abstain`];
-
-    public text!: string;
-    public yes!: number;
-    public no!: number;
-    public abstain!: number;
-
-    public poll_id!: Id; // (assignment|motion)_poll/option_ids;
-    public used_as_global_option_in_poll_id: Id; // (assignment|motion)_poll/global_option_id;
-    public vote_ids!: Ids; // ((assignment|motion)_vote/option_id)[];
-    public meeting_id!: Id;
-
-    public weight!: number;
-    public content_object_id!: Fqid;
-
-    public constructor(input?: any) {
-        super(Option.COLLECTION, input);
-    }
-
-    protected getDecimalFields(): (keyof Option)[] {
-        return Option.DECIMAL_FIELDS;
-    }
-
-    public static readonly REQUESTABLE_FIELDS: (keyof Option)[] = [
-        `id`,
-        `weight`,
-        `text`,
-        `yes`,
-        `no`,
-        `abstain`,
-        `poll_id`,
-        `used_as_global_option_in_poll_id`,
-        `vote_ids`,
-        `content_object_id`,
-        `meeting_id`
-    ];
-}
diff --git a/client/src/app/domain/models/poll/poll-config-approval.ts b/client/src/app/domain/models/poll/poll-config-approval.ts
new file mode 100644
index 0000000000..e11c7bf025
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-approval.ts
@@ -0,0 +1,25 @@
+import { HasMeetingId } from '../../interfaces';
+import { BasePollConfigModel } from './base-poll-config';
+import { BaseOnehundredPercentBase } from './poll-config-types';
+
+export type ApprovalOnehundredPercentBase = BaseOnehundredPercentBase | `yes_no`;
+
+export class PollConfigApproval extends BasePollConfigModel<PollConfigApproval> {
+    public static COLLECTION = `poll_config_approval`;
+
+    public allow_abstain!: boolean;
+    public onehundred_percent_base!: ApprovalOnehundredPercentBase;
+
+    public constructor(input?: Partial<PollConfigApproval>) {
+        super(PollConfigApproval.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollConfigApproval)[] = [
+        `id`,
+        `poll_id`,
+        `allow_abstain`,
+        `onehundred_percent_base`
+    ];
+}
+
+export interface PollConfigApproval extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll-config-rating-approval.ts b/client/src/app/domain/models/poll/poll-config-rating-approval.ts
new file mode 100644
index 0000000000..b2b2d54525
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-rating-approval.ts
@@ -0,0 +1,29 @@
+import { HasMeetingId } from '../../interfaces';
+import { BasePollConfigModel } from './base-poll-config';
+import { BaseOnehundredPercentBase } from './poll-config-types';
+
+export type RatingApprovalOnehundredPercentBase = BaseOnehundredPercentBase | `yes_no`;
+
+export class PollConfigRatingApproval extends BasePollConfigModel<PollConfigRatingApproval> {
+    public static COLLECTION = `poll_config_rating_approval`;
+
+    public max_options_amount!: number;
+    public min_options_amount!: number;
+    public allow_abstain!: boolean;
+    public onehundred_percent_base!: RatingApprovalOnehundredPercentBase;
+
+    public constructor(input?: Partial<PollConfigRatingApproval>) {
+        super(PollConfigRatingApproval.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollConfigRatingApproval)[] = [
+        `id`,
+        `poll_id`,
+        `max_options_amount`,
+        `min_options_amount`,
+        `allow_abstain`,
+        `onehundred_percent_base`
+    ];
+}
+
+export interface PollConfigRatingApproval extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll-config-rating-score.ts b/client/src/app/domain/models/poll/poll-config-rating-score.ts
new file mode 100644
index 0000000000..f66b5f58fe
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-rating-score.ts
@@ -0,0 +1,33 @@
+import { HasMeetingId } from '../../interfaces';
+import { BasePollConfigModel } from './base-poll-config';
+import { BaseOnehundredPercentBase } from './poll-config-types';
+
+export type RatingScoreOnehundredPercentBase = BaseOnehundredPercentBase | `yes_no`;
+
+export class PollConfigRatingScore extends BasePollConfigModel<PollConfigRatingScore> {
+    public static COLLECTION = `poll_config_rating_score`;
+
+    public max_options_amount!: number;
+    public min_options_amount!: number;
+    public max_votes_per_option!: number;
+    public max_vote_sum!: number;
+    public min_vote_sum!: number;
+    public onehundred_percent_base!: RatingScoreOnehundredPercentBase;
+
+    public constructor(input?: Partial<PollConfigRatingScore>) {
+        super(PollConfigRatingScore.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollConfigRatingScore)[] = [
+        `id`,
+        `poll_id`,
+        `max_options_amount`,
+        `min_options_amount`,
+        `max_votes_per_option`,
+        `max_vote_sum`,
+        `min_vote_sum`,
+        `onehundred_percent_base`
+    ];
+}
+
+export interface PollConfigRatingScore extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll-config-selection.ts b/client/src/app/domain/models/poll/poll-config-selection.ts
new file mode 100644
index 0000000000..abb7b1d21d
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-selection.ts
@@ -0,0 +1,31 @@
+import { HasMeetingId } from '../../interfaces';
+import { BasePollConfigModel } from './base-poll-config';
+import { BaseOnehundredPercentBase } from './poll-config-types';
+
+export type SelectionOnehundredPercentBase = BaseOnehundredPercentBase | `no_general`;
+
+export class PollConfigSelection extends BasePollConfigModel<PollConfigSelection> {
+    public static COLLECTION = `poll_config_selection`;
+
+    public strike_out!: boolean;
+    public max_options_amount!: number;
+    public min_options_amount!: number;
+    public allow_nota!: boolean;
+    public onehundred_percent_base!: SelectionOnehundredPercentBase;
+
+    public constructor(input?: Partial<PollConfigSelection>) {
+        super(PollConfigSelection.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollConfigSelection)[] = [
+        `id`,
+        `poll_id`,
+        `max_options_amount`,
+        `min_options_amount`,
+        `allow_nota`,
+        `strike_out`,
+        `onehundred_percent_base`
+    ];
+}
+
+export interface PollConfigSelection extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll-config-stv-scottish.ts b/client/src/app/domain/models/poll/poll-config-stv-scottish.ts
new file mode 100644
index 0000000000..d8177b6641
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-stv-scottish.ts
@@ -0,0 +1,16 @@
+import { HasMeetingId } from '../../interfaces';
+import { BasePollConfigModel } from './base-poll-config';
+
+export class PollConfigStvScottish extends BasePollConfigModel<PollConfigStvScottish> {
+    public static COLLECTION = `poll_config_stv_scottish`;
+
+    public posts!: number;
+
+    public constructor(input?: Partial<PollConfigStvScottish>) {
+        super(PollConfigStvScottish.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollConfigStvScottish)[] = [`id`, `poll_id`, `posts`];
+}
+
+export interface PollConfigStvScottish extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll-config-types.ts b/client/src/app/domain/models/poll/poll-config-types.ts
new file mode 100644
index 0000000000..3281221faa
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-config-types.ts
@@ -0,0 +1 @@
+export type BaseOnehundredPercentBase = `valid` | `cast` | `entitled` | `entitled_present` | `disabled`;
diff --git a/client/src/app/domain/models/poll/poll-constants.ts b/client/src/app/domain/models/poll/poll-constants.ts
index b66939b7b9..6d4afd3818 100644
--- a/client/src/app/domain/models/poll/poll-constants.ts
+++ b/client/src/app/domain/models/poll/poll-constants.ts
@@ -1,30 +1,18 @@
 import { _ } from '@ngx-translate/core';
 
-import { OptionDataKey, PollDataKey } from './generic-poll';
+import { OptionDataKey } from './generic-poll';
 
-export const YES_KEY = `yes`;
-export const NO_KEY = `no`;
-export const ABSTAIN_KEY = `abstain`;
-export const INVALID_VOTES_KEY = `votesinvalid`;
-
-export enum PollBackendDurationType {
-    LONG = `long`,
-    FAST = `fast`
+export enum PollState {
+    Created = `created`,
+    Started = `started`,
+    Finished = `finished`
 }
 
-export const PollBackendDurationChoices = {
-    [PollBackendDurationType.FAST]: _(`short running`),
-    [PollBackendDurationType.LONG]: _(`long running`)
-};
-
-export type PollMethodYNA = `Y` | `N` | `A`;
-export type PollMethodYN = `Y` | `N`;
-export type GlobalVote = `Y` | `A` | `N`;
-
-export enum PollClassType {
-    Motion = `motion`,
-    Assignment = `assignment`,
-    Topic = `topic`
+export enum PollVisibility {
+    Manually = `manually`,
+    Named = `named`,
+    Open = `open`,
+    Secret = `secret`
 }
 
 /**
@@ -52,44 +40,11 @@ export const pollChartGreys = new Map<string, string>([
     [`grey5`, `#f5f5f5`]
 ]);
 
-export enum PollState {
-    Created = `created`,
-    Started = `started`,
-    Finished = `finished`,
-    Published = `published`
-}
-
-export enum PollType {
-    Analog = `analog`,
-    Named = `named`,
-    Pseudoanonymous = `pseudoanonymous`
-}
-
-export enum PollMethod {
-    Y = `Y`,
-    YN = `YN`,
-    YNA = `YNA`,
-    N = `N`
-}
-
-export enum FormPollMethod {
-    Y = `Y`,
-    YN = `YN`,
-    YNA = `YNA`,
-    N = `N`,
-    LIST_YNA = `yna`
-}
+// TODO: Check if anything below can be removed
 
-export enum PollPercentBase {
-    Y = `Y`,
-    YN = `YN`,
-    YNA = `YNA`,
-    Valid = `valid`,
-    Cast = `cast`,
-    Entitled = `entitled`,
-    EntitledPresent = `entitled_present`,
-    Disabled = `disabled`
-}
+export const YES_KEY = `yes`;
+export const NO_KEY = `no`;
+export const ABSTAIN_KEY = `abstain`;
 
 export interface EntitledUsersEntry {
     user_id: number;
@@ -104,33 +59,6 @@ export const VOTE_MAJORITY = -1;
 export const VOTE_UNDOCUMENTED = -2;
 export const LOWEST_VOTE_VALUE = VOTE_UNDOCUMENTED;
 
-export const PollClassTypeVerbose = {
-    motion: `Vote`,
-    assignment: `Ballot`
-};
-
-export const PollStateVerbose = {
-    created: `created`,
-    started: `started`,
-    finished: `finished (unpublished)`,
-    published: `published`
-};
-
-export const PollStateChangeActionVerbose = {
-    created: _(`Reset`),
-    started: _(`Start voting`),
-    finished: _(`Stop voting`),
-    published: _(`Publish`)
-};
-
-export const PollTypeVerbose = {
-    analog: _(`analog`),
-    named: _(`nominal`),
-    pseudoanonymous: _(`non-nominal`)
-};
-
-export type PollTypeVerboseKey = keyof typeof PollTypeVerbose;
-
 export const PollPropertyVerbose = {
     onehundred_percent_base: _(`100% base`),
     type: _(`Voting type`),
@@ -163,26 +91,6 @@ export const PollValues: any = {
     amount_global_abstain: _(`General abstain`)
 };
 
-export const PollMethodVerbose = {
-    Y: ``,
-    N: ``,
-    YN: _(`Yes/No`),
-    YNA: _(`Yes/No/Abstain`)
-};
-
-export const PollPercentBaseVerbose = {
-    Y: _(`Sum of votes without general options`),
-    YN: _(`Yes/No`),
-    YNA: _(`Yes/No/Abstain`),
-    valid: _(`All valid ballots`),
-    cast: _(`All casted ballots`),
-    entitled: _(`All entitled users`),
-    entitled_present: _(`Present entitled users`),
-    disabled: _(`Disabled (no percents)`)
-};
-
-export type PollPercentBaseVerboseKey = keyof typeof PollPercentBaseVerbose;
-
 export type GlobalOptionKey = `global_yes` | `global_no` | `global_abstain`;
 export type VoteKey = `votesvalid` | `votesinvalid` | `votescast`;
 
@@ -223,7 +131,7 @@ export function isPollTableData(data: any): data is PollTableData {
 }
 
 export interface VotingResult {
-    vote?: OptionDataKey | PollDataKey;
+    vote?: OptionDataKey;
     amount?: number;
     icon?: string;
     hide?: boolean;
diff --git a/client/src/app/domain/models/poll/poll-option.ts b/client/src/app/domain/models/poll/poll-option.ts
new file mode 100644
index 0000000000..8541ed45a5
--- /dev/null
+++ b/client/src/app/domain/models/poll/poll-option.ts
@@ -0,0 +1,27 @@
+import { Id } from '../../definitions/key-types';
+import { HasMeetingId } from '../../interfaces';
+import { BaseModel } from '../base/base-model';
+
+export class PollOption extends BaseModel<PollOption> {
+    public static COLLECTION = `poll_option`;
+
+    public poll_id: Id;
+
+    public weight: number;
+    public text: string;
+    public meeting_user_id: Id;
+
+    public constructor(input?: Partial<PollOption>) {
+        super(PollOption.COLLECTION, input);
+    }
+
+    public static readonly REQUESTABLE_FIELDS: (keyof PollOption)[] = [
+        `id`,
+        `poll_id`,
+        `weight`,
+        `text`,
+        `meeting_user_id`
+    ];
+}
+
+export interface PollOption extends HasMeetingId {}
diff --git a/client/src/app/domain/models/poll/poll.ts b/client/src/app/domain/models/poll/poll.ts
index 5af2dd5f4c..6994ab2a09 100644
--- a/client/src/app/domain/models/poll/poll.ts
+++ b/client/src/app/domain/models/poll/poll.ts
@@ -3,57 +3,30 @@ import { HasSequentialNumber } from 'src/app/domain/interfaces';
 import { Fqid, Id } from '../../definitions/key-types';
 import { HasMeetingId } from '../../interfaces/has-meeting-id';
 import { HasProjectionIds } from '../../interfaces/has-projectable-ids';
-import { BaseDecimalModel } from '../base/base-decimal-model';
-import {
-    CalculablePollKey,
-    EntitledUsersEntry,
-    PollBackendDurationType,
-    PollMethod,
-    PollPercentBase,
-    PollState,
-    PollType
-} from './poll-constants';
-
-export class Poll extends BaseDecimalModel<Poll> {
+import { BaseModel } from '../base/base-model';
+import { PollState, PollVisibility } from './poll-constants';
+
+export class Poll extends BaseModel<Poll> {
     public static readonly COLLECTION = `poll`;
-    public static readonly DECIMAL_FIELDS: (keyof Poll)[] = [`votesvalid`, `votesinvalid`, `votescast`];
 
     public sequential_number!: number;
-    public content_object_id!: Fqid;
-    public state!: PollState;
-    public type!: PollType;
     public title!: string;
-    public votesvalid!: number;
-    public votesinvalid!: number;
-    public votescast!: number;
-    public live_votes: Record<number, any>;
-    public live_voting_enabled: number[];
-    public onehundred_percent_base!: PollPercentBase;
-
-    /**
-     * TODO:
-     * Not sure how vote delegations are handled now
-     */
-    public user_has_voted_for_delegations!: Id[];
-
-    public pollmethod!: PollMethod;
-
-    public voted_ids!: Id[]; // (user/poll_voted_ids)[];
-
-    public entitled_group_ids!: Id[]; // (group/(assignment|motion)_poll_ids)[];
-    public option_ids!: Id[]; // ((assignment|motion)_option/poll_id)[];
-    public global_option_id!: Id; // (motion_option/poll_id)
-    public backend!: PollBackendDurationType;
+    public content_object_id!: Fqid;
 
-    public description!: string;
-    public min_votes_amount!: number;
-    public max_votes_amount!: number;
-    public max_votes_per_option!: number;
-    public global_yes!: boolean;
-    public global_no!: boolean;
-    public global_abstain!: boolean;
-    public entitled_users_at_stop!: EntitledUsersEntry[];
-    public is_pseudoanonymized!: boolean;
+    public config_id!: Fqid;
+    public visibility!: PollVisibility;
+    public state!: PollState;
+    public result!: string;
+    public published!: boolean;
+    public allow_invalid!: boolean;
+    public allow_vote_split!: boolean;
+    public option_ids!: Id[];
+    public ballot_ids!: Id[];
+    public voted_ids!: Id[];
+    public entitled_group_ids!: Id[];
+
+    // TODO: Currently missing in backend
+    public live_voting_enabled!: boolean;
 
     public get isCreated(): boolean {
         return this.state === PollState.Created;
@@ -67,28 +40,37 @@ export class Poll extends BaseDecimalModel<Poll> {
         return this.state === PollState.Finished;
     }
 
-    public get isPublished(): boolean {
-        return this.state === PollState.Published;
+    public get isAnonymized(): boolean {
+        // TODO: Implement if field is available to decide this
+        return !this.isNamed && !this.isAnalog && false;
+    }
+
+    public get canAnonymize(): boolean {
+        return !this.isAnonymized && !this.isAnalog && !this.isNamed && (this.isFinished || this.isPublished);
     }
 
-    public get isPercentBaseCast(): boolean {
-        return this.onehundred_percent_base === PollPercentBase.Cast;
+    public get isPublished(): boolean {
+        return this.state === PollState.Finished && this.published;
     }
 
     public get isAnalog(): boolean {
-        return this.type === PollType.Analog;
+        return this.visibility === PollVisibility.Manually;
     }
 
     public get isNamed(): boolean {
-        return this.type === PollType.Named;
+        return this.visibility === PollVisibility.Named;
+    }
+
+    public get isOpen(): boolean {
+        return this.visibility === PollVisibility.Open;
     }
 
     public get isAnonymous(): boolean {
-        return this.type === PollType.Pseudoanonymous;
+        return this.visibility === PollVisibility.Secret;
     }
 
     public get isEVoting(): boolean {
-        return this.isNamed || this.isAnonymous;
+        return this.isNamed || this.isOpen || this.isAnonymous;
     }
 
     /**
@@ -98,16 +80,14 @@ export class Poll extends BaseDecimalModel<Poll> {
         return this.isFinished || this.isPublished;
     }
 
-    public get nextState(): PollState {
+    public get nextState(): PollState | `published` {
         switch (this.state) {
             case PollState.Created:
                 return PollState.Started;
             case PollState.Started:
                 return PollState.Finished;
             case PollState.Finished:
-                return PollState.Published;
-            case PollState.Published:
-                return PollState.Created;
+                return `published`;
         }
     }
 
@@ -115,67 +95,20 @@ export class Poll extends BaseDecimalModel<Poll> {
         super(Poll.COLLECTION, input);
     }
 
-    public get isMethodY(): boolean {
-        return this.pollmethod === PollMethod.Y;
-    }
-
-    public get isMethodN(): boolean {
-        return this.pollmethod === PollMethod.N;
-    }
-
-    public get isMethodYN(): boolean {
-        return this.pollmethod === PollMethod.YN;
-    }
-
-    public get isMethodYNA(): boolean {
-        return this.pollmethod === PollMethod.YNA;
-    }
-
-    public get hasGlobalOptionEnabled(): boolean {
-        return this.global_yes || this.global_no || this.global_abstain;
-    }
-
-    public get pollmethodFields(): CalculablePollKey[] {
-        if (this.pollmethod === PollMethod.YN) {
-            return [`yes`, `no`];
-        } else if (this.pollmethod === PollMethod.YNA) {
-            return [`yes`, `no`, `abstain`];
-        } else if (this.pollmethod === PollMethod.Y) {
-            return [`yes`];
-        }
-        return [];
-    }
-
-    protected getDecimalFields(): (keyof Poll)[] {
-        return Poll.DECIMAL_FIELDS;
-    }
-
     public static readonly REQUESTABLE_FIELDS: (keyof Poll)[] = [
         `id`,
         `title`,
-        `description`,
-        `type`,
-        `backend`,
-        `is_pseudoanonymized`,
-        `pollmethod`,
+        `config_id`,
+        `option_ids`,
+        `visibility`,
         `state`,
-        `min_votes_amount`,
-        `max_votes_amount`,
-        `max_votes_per_option`,
-        `global_yes`,
-        `global_no`,
-        `global_abstain`,
-        `onehundred_percent_base`,
-        `votesvalid`,
-        `votesinvalid`,
-        `votescast`,
-        `entitled_users_at_stop`,
-        `live_voting_enabled`,
-        `live_votes`,
+        `result`,
+        `published`,
+        `allow_invalid`,
+        `allow_vote_split`,
         `sequential_number`,
         `content_object_id`,
-        `option_ids`,
-        `global_option_id`,
+        `ballot_ids`,
         `voted_ids`,
         `entitled_group_ids`,
         `projection_ids`,
diff --git a/client/src/app/domain/models/poll/vote.ts b/client/src/app/domain/models/poll/vote.ts
deleted file mode 100644
index 8580e45db6..0000000000
--- a/client/src/app/domain/models/poll/vote.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Id } from '../../definitions/key-types';
-import { HasMeetingId } from '../../interfaces/has-meeting-id';
-import { BaseModel } from '../base/base-model';
-import { VoteValue, VoteValueVerbose } from './vote-constants';
-
-export class Vote extends BaseModel<Vote> {
-    public static COLLECTION = `vote`;
-
-    public weight!: number;
-    public value!: VoteValue;
-
-    public option_id!: Id; // (assignment|motion)_option/vote_ids;
-    public user_id!: Id; // user/vote_ids;
-    /** Id of the MeetingUser the vote got delegated to */
-    public delegated_user_id!: Id; // meeting_user/vote_delegated_vote_ids;
-    public user_token!: string;
-
-    public get valueVerbose(): string {
-        return VoteValueVerbose[this.value];
-    }
-
-    public constructor(input?: Partial<Vote>) {
-        super(Vote.COLLECTION, input);
-    }
-
-    protected getDecimalFields(): string[] {
-        return [`weight`];
-    }
-
-    public static readonly REQUESTABLE_FIELDS: (keyof Vote)[] = [
-        `id`,
-        `weight`,
-        `value`,
-        `user_token`,
-        `option_id`,
-        `user_id`,
-        `delegated_user_id`,
-        `meeting_id`
-    ];
-}
-
-export interface Vote extends HasMeetingId {}
diff --git a/client/src/app/domain/models/users/user.ts b/client/src/app/domain/models/users/user.ts
index 6c0ea48951..d0a62cbca0 100644
--- a/client/src/app/domain/models/users/user.ts
+++ b/client/src/app/domain/models/users/user.ts
@@ -91,10 +91,6 @@ export class User extends BaseDecimalModel<User> {
         `committee_ids`,
         `committee_management_ids`,
         `meeting_user_ids`,
-        `poll_voted_ids`,
-        `option_ids`,
-        `vote_ids`,
-        `poll_candidate_ids`,
         `home_committee_id`,
         `history_position_ids`,
         `history_entry_ids`,
diff --git a/client/src/app/domain/translations/index.ts b/client/src/app/domain/translations/index.ts
new file mode 100644
index 0000000000..8fe6eba9ec
--- /dev/null
+++ b/client/src/app/domain/translations/index.ts
@@ -0,0 +1,5 @@
+import polls from './poll';
+
+export const KeyedTranslations = {
+    ...polls
+};
diff --git a/client/src/app/domain/translations/poll.ts b/client/src/app/domain/translations/poll.ts
new file mode 100644
index 0000000000..faeffd866d
--- /dev/null
+++ b/client/src/app/domain/translations/poll.ts
@@ -0,0 +1,23 @@
+import { _ } from '@ngx-translate/core';
+
+export default {
+    'poll_visibility.manually': _(`Analog`),
+    'poll_visibility.open': _(`Open`),
+    'poll_visibility.secret': _(`Secret`),
+    'poll_visibility.named': _(`Named`),
+    'poll_state.created': _(`created`),
+    'poll_state.started': _(`started`),
+    'poll_state.finished': _(`finished`),
+    'poll_state_change_action.created': _(`Reset`),
+    'poll_state_change_action.started': _(`Start voting`),
+    'poll_state_change_action.finished': _(`Stop voting`),
+    'poll_state_change_action.published': _(`Publish`),
+    'poll_percent_base.Y': _(`Sum of votes without general options`), // TODO: Key incorrect
+    'poll_percent_base.YN': _(`Yes/No`), // TODO: Key incorrect
+    'poll_percent_base.YNA': _(`Yes/No/Abstain`), // TODO: Key incorrect
+    'poll_percent_base.valid': _(`All valid ballots`),
+    'poll_percent_base.cast': _(`All casted ballots`),
+    'poll_percent_base.entitled': _(`All entitled users`),
+    'poll_percent_base.entitled_present': _(`Present entitled users`),
+    'poll_percent_base.disabled': _(`Disabled (no percents)`)
+};
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/index.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/index.ts
deleted file mode 100644
index b601382d65..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './poll-candidate-list-repository.service';
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts
deleted file mode 100644
index a7bb0a3531..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { PollCandidateListRepositoryService } from './poll-candidate-list-repository.service';
-
-xdescribe(`PollCandidateListRepositoryService`, () => {
-    let service: PollCandidateListRepositoryService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({});
-        service = TestBed.inject(PollCandidateListRepositoryService);
-    });
-
-    it(`should be created`, () => {
-        expect(service).toBeTruthy();
-    });
-});
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts
deleted file mode 100644
index f3a59a1e0b..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Injectable } from '@angular/core';
-import { _ } from '@ngx-translate/core';
-import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list';
-import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
-import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder';
-
-import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
-import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
-
-/**
- * Repository service for the PollCandidateList.
- *
- * Since this model will be exclusively found/called through the related models
- * and has no actions that would need to be called by the client,
- * there is no need for a corresponding controller service, since it wouldn't be used anyway.
- *
- * Should it ever become necessary to perform actions or call upon the ViewModelLists,
- * please create a new controller service instead of directly calling the repository.
- */
-@Injectable({
-    providedIn: `root`
-})
-export class PollCandidateListRepositoryService extends BaseMeetingRelatedRepository<
-    ViewPollCandidateList,
-    PollCandidateList
-> {
-    public constructor(repoServiceCollector: RepositoryMeetingServiceCollectorService) {
-        super(repoServiceCollector, PollCandidateList);
-    }
-
-    public getVerboseName = (plural?: boolean): string => (plural ? `PollCandidateLists` : `PollCandidateList`);
-    public getTitle = (): string => _(`Confirmation of the nomination list`);
-
-    public override getFieldsets(): Fieldsets<PollCandidateList> {
-        const detailFieldset: (keyof PollCandidateList)[] = [`poll_candidate_ids`, `option_id`, `meeting_id`];
-        return {
-            [DEFAULT_FIELDSET]: detailFieldset
-        };
-    }
-}
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/index.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/index.ts
deleted file mode 100644
index 90976660cc..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './poll-candidate-repository.service';
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts
deleted file mode 100644
index 1bb60dd5f1..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { PollCandidateRepositoryService } from './poll-candidate-repository.service';
-
-xdescribe(`PollCandidateRepositoryService`, () => {
-    let service: PollCandidateRepositoryService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({});
-        service = TestBed.inject(PollCandidateRepositoryService);
-    });
-
-    it(`should be created`, () => {
-        expect(service).toBeTruthy();
-    });
-});
diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts
deleted file mode 100644
index 579f392f30..0000000000
--- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Injectable } from '@angular/core';
-import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate';
-import { ViewPollCandidate } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate';
-import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder';
-
-import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
-import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
-
-/**
- * Repository service for the PollCandidate.
- *
- * Since this model will be exclusively found/called through the related models
- * and has no actions that would need to be called by the client,
- * there is no need for a corresponding controller service, since it wouldn't be used anyway.
- *
- * Should it ever become necessary to perform actions or call upon the ViewModelLists,
- * please create a new controller service instead of directly calling the repository.
- */
-@Injectable({
-    providedIn: `root`
-})
-export class PollCandidateRepositoryService extends BaseMeetingRelatedRepository<ViewPollCandidate, PollCandidate> {
-    public constructor(repoServiceCollector: RepositoryMeetingServiceCollectorService) {
-        super(repoServiceCollector, PollCandidate);
-    }
-
-    public getVerboseName = (plural?: boolean): string => (plural ? `PollCandidates` : `PollCandidate`);
-    public getTitle = (viewModel: ViewPollCandidate): string => viewModel.user?.getShortName();
-
-    public override getFieldsets(): Fieldsets<PollCandidate> {
-        const detailFieldset: (keyof PollCandidate)[] = [`poll_candidate_list_id`, `user_id`, `weight`, `meeting_id`];
-        return {
-            [DEFAULT_FIELDSET]: detailFieldset
-        };
-    }
-}
diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts b/client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.spec.ts
similarity index 51%
rename from client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts
rename to client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.spec.ts
index 089be882ce..2b13f5e0d4 100644
--- a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts
+++ b/client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { OptionRepositoryService } from './option-repository.service';
+import { BallotRepositoryService } from './ballot-repository.service';
 
-xdescribe(`OptionRepositoryService`, () => {
-    let service: OptionRepositoryService;
+xdescribe(`BallotRepositoryService`, () => {
+    let service: BallotRepositoryService;
 
     beforeEach(() => {
         TestBed.configureTestingModule({});
-        service = TestBed.inject(OptionRepositoryService);
+        service = TestBed.inject(BallotRepositoryService);
     });
 
     it(`should be created`, () => {
diff --git a/client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.ts b/client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.ts
new file mode 100644
index 0000000000..8cc088d65f
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/ballot-repository.service/ballot-repository.service.ts
@@ -0,0 +1,53 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { Id } from 'src/app/domain/definitions/key-types';
+import { Ballot } from 'src/app/domain/models/poll/ballot';
+import { ViewBallot, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
+
+import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
+
+/**
+ * keys are poll ids,
+ * the arrays contain the ids of the users that have voted for the corresponding polls
+ */
+export type HasVotedResponse = Record<string, Id[]>;
+
+export interface VotePayload {
+    user_id: Id;
+    value: any;
+}
+
+@Injectable({
+    providedIn: `root`
+})
+export class BallotRepositoryService extends BaseMeetingRelatedRepository<ViewBallot, Ballot> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, Ballot);
+    }
+
+    public getTitle = (): string => `Vote`;
+
+    public getVerboseName = (plural = false): string => this.translate.instant(plural ? `Votes` : `Vote`);
+
+    public async sendVote(_pollId: Id, _payload: VotePayload): Promise<void> {
+        // await this.http.post(`${VOTE_URL}?id=${pollId}`, payload);
+
+        throw new Error(`Not implemented`);
+    }
+
+    /**
+     * This method subscribes to polls and waits until the poll got
+     * voted for or the poll finished
+     *
+     * @param poll The poll that should be subscribed
+     * @return the ViewPoll
+     */
+    public subscribeVoted(_poll: ViewPoll, _userIds?: number[]): BehaviorSubject<Id[]> | null {
+        throw new Error(`Not implemented`);
+    }
+
+    public updateStartedPolls(_polls: Id[]): void {
+        throw new Error(`Not implemented`);
+    }
+}
diff --git a/client/src/app/gateways/repositories/polls/ballot-repository.service/index.ts b/client/src/app/gateways/repositories/polls/ballot-repository.service/index.ts
new file mode 100644
index 0000000000..cd2bb544ea
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/ballot-repository.service/index.ts
@@ -0,0 +1 @@
+export * from './ballot-repository.service';
diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/index.ts b/client/src/app/gateways/repositories/polls/option-repository.service/index.ts
deleted file mode 100644
index 09c6657e2e..0000000000
--- a/client/src/app/gateways/repositories/polls/option-repository.service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './option-repository.service';
diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts
deleted file mode 100644
index 43af9f79f1..0000000000
--- a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Option } from 'src/app/domain/models/poll/option';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
-
-import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
-import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
-
-@Injectable({
-    providedIn: `root`
-})
-export class OptionRepositoryService extends BaseMeetingRelatedRepository<ViewOption, Option> {
-    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
-        super(repositoryServiceCollector, Option);
-    }
-
-    public getTitle = (_viewOption: ViewOption): string => `Option`;
-
-    public getVerboseName = (plural = false): string => this.translate.instant(plural ? `Options` : `Option`);
-}
diff --git a/client/src/app/gateways/repositories/polls/poll-config-approval-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-config-approval-repository.service.ts
new file mode 100644
index 0000000000..0dfe2baa9b
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-config-approval-repository.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { PollConfigApproval } from 'src/app/domain/models/poll/poll-config-approval';
+import { ViewPollConfigApproval } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-config-approval';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollConfigApprovalRepositoryService extends BaseMeetingRelatedRepository<
+    ViewPollConfigApproval,
+    PollConfigApproval
+> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollConfigApproval);
+    }
+
+    public getTitle = (_viewPollConfigApproval: ViewPollConfigApproval): string => `Approval poll config`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `Approval poll configs` : `Approval poll config`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-config-rating-approval-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-config-rating-approval-repository.service.ts
new file mode 100644
index 0000000000..34f45f4bb0
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-config-rating-approval-repository.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { PollConfigRatingApproval } from 'src/app/domain/models/poll/poll-config-rating-approval';
+import { ViewPollConfigRatingApproval } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-approval';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollConfigRatingApprovalRepositoryService extends BaseMeetingRelatedRepository<
+    ViewPollConfigRatingApproval,
+    PollConfigRatingApproval
+> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollConfigRatingApproval);
+    }
+
+    public getTitle = (_viewPollConfigRatingApproval: ViewPollConfigRatingApproval): string =>
+        `Rating approval poll config`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `Rating approval poll configs` : `Rating approval poll config`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-config-rating-score-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-config-rating-score-repository.service.ts
new file mode 100644
index 0000000000..d4aa090d65
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-config-rating-score-repository.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { PollConfigRatingScore } from 'src/app/domain/models/poll/poll-config-rating-score';
+import { ViewPollConfigRatingScore } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-score';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollConfigRatingScoreRepositoryService extends BaseMeetingRelatedRepository<
+    ViewPollConfigRatingScore,
+    PollConfigRatingScore
+> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollConfigRatingScore);
+    }
+
+    public getTitle = (_viewPollConfigRatingScore: ViewPollConfigRatingScore): string => `Rating score poll config`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `Rating score poll configs` : `Rating score poll config`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-config-selection-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-config-selection-repository.service.ts
new file mode 100644
index 0000000000..296426c901
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-config-selection-repository.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { PollConfigSelection } from 'src/app/domain/models/poll/poll-config-selection';
+import { ViewPollConfigSelection } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-config-selection';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollConfigSelectionRepositoryService extends BaseMeetingRelatedRepository<
+    ViewPollConfigSelection,
+    PollConfigSelection
+> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollConfigSelection);
+    }
+
+    public getTitle = (_viewPollConfigSelection: ViewPollConfigSelection): string => `Selection poll config`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `Selection poll configs` : `Selection poll config`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-config-stv-scottish-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-config-stv-scottish-repository.service.ts
new file mode 100644
index 0000000000..ef21c58b84
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-config-stv-scottish-repository.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { PollConfigStvScottish } from 'src/app/domain/models/poll/poll-config-stv-scottish';
+import { ViewPollConfigStvScottish } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-config-stv-scottish';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollConfigStvScottishRepositoryService extends BaseMeetingRelatedRepository<
+    ViewPollConfigStvScottish,
+    PollConfigStvScottish
+> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollConfigStvScottish);
+    }
+
+    public getTitle = (_viewPollConfigStvScottish: ViewPollConfigStvScottish): string => `STV (Scottish) poll config`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `STV (Scottish) poll configs` : `STV (Scottish) poll config`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-option-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-option-repository.service.ts
new file mode 100644
index 0000000000..cefb216422
--- /dev/null
+++ b/client/src/app/gateways/repositories/polls/poll-option-repository.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { PollOption } from 'src/app/domain/models/poll/poll-option';
+import { ViewPollOption } from 'src/app/site/pages/meetings/pages/polls/view-models/poll-option';
+
+import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
+import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
+
+@Injectable({
+    providedIn: `root`
+})
+export class PollOptionRepositoryService extends BaseMeetingRelatedRepository<ViewPollOption, PollOption> {
+    public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
+        super(repositoryServiceCollector, PollOption);
+    }
+
+    public getTitle = (_viewPollConfigOption: ViewPollOption): string => `Poll config option`;
+
+    public getVerboseName = (plural = false): string =>
+        this.translate.instant(plural ? `Poll config options` : `Poll config option`);
+}
diff --git a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts
index cdb4406494..858bb6cf44 100644
--- a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts
+++ b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts
@@ -1,39 +1,24 @@
-import { Injectable } from '@angular/core';
-import { Decimal } from 'src/app/domain/definitions/key-types';
+import { inject, Injectable } from '@angular/core';
+import { map, Observable, switchMap, takeWhile } from 'rxjs';
+import { Id } from 'src/app/domain/definitions/key-types';
 import { Poll } from 'src/app/domain/models/poll/poll';
-import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants';
-import { toDecimal } from 'src/app/infrastructure/utils';
-import { VoteControllerService } from 'src/app/site/pages/meetings/modules/poll/services/vote-controller.service';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
+import { PollState, PollVisibility } from 'src/app/domain/models/poll/poll-constants';
+import { PollCreatePayload, PollUpdatePayload, VoteApiService } from 'src/app/gateways/vote-api.service';
+import { ViewBallot, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { Fieldsets } from 'src/app/site/services/model-request-builder';
 
 import { Identifiable } from '../../../../domain/interfaces/identifiable';
 import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
 import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
-import { VoteRepositoryService } from '../vote-repository.service';
 import { PollAction } from './poll.action';
 
-interface AnalogPollVotesValues {
-    votescast?: Decimal;
-    votesvalid?: Decimal;
-    votesinvalid?: Decimal;
-}
-
-interface AnalogPollGlobalValues {
-    amount_global_yes?: Decimal;
-    amount_global_no?: Decimal;
-    amount_global_abstain?: Decimal;
-}
-
 @Injectable({
     providedIn: `root`
 })
 export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll, Poll> {
-    public constructor(
-        repoServiceCollector: RepositoryMeetingServiceCollectorService,
-        private voteController: VoteControllerService,
-        private voteRepo: VoteRepositoryService
-    ) {
+    private voteApi = inject(VoteApiService);
+
+    public constructor(repoServiceCollector: RepositoryMeetingServiceCollectorService) {
         super(repoServiceCollector, Poll);
     }
 
@@ -47,12 +32,9 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             `entitled_group_ids`,
             `state`,
             `title`,
-            `type`,
-            `pollmethod`,
-            `onehundred_percent_base`,
-            `backend`,
+            `visibility`,
             `content_object_id`,
-            `is_pseudoanonymized`
+            `config_id`
         ];
         return {
             ...super.getFieldsets(),
@@ -60,84 +42,52 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
         };
     }
 
-    public async create(poll: any): Promise<Identifiable> {
-        if (
-            Array.isArray(poll.options) &&
-            typeof poll.min_votes_amount === `number` &&
-            typeof poll.max_votes_per_option === `number` &&
-            poll.options?.length < poll.min_votes_amount / poll.max_votes_per_option
-        ) {
-            throw new Error(
-                `Poll creation aborted because the minimum amount of votes was set higher than the number of available options`
-            );
-        }
-        if (poll.type === PollType.Analog) {
+    public async create(poll: PollCreatePayload): Promise<Identifiable> {
+        if (poll.visibility === PollVisibility.Manually) {
             return this.createAnalogPoll(poll);
-        } else {
-            return this.createElectronicPoll(poll);
         }
+
+        return this.createElectronicPoll(poll);
     }
 
-    public async update(update: any, viewPoll: ViewPoll, option: any[] = []): Promise<void> {
-        if (update.type === PollType.Analog) {
-            return this.updateAnalogPoll(update, viewPoll, option);
-        } else {
-            return this.updateElectronicPoll(update, viewPoll);
+    public async update(poll: ViewPoll, payload: PollUpdatePayload): Promise<void> {
+        if (payload.visibility === PollVisibility.Manually) {
+            return this.updateAnalogPoll(poll.id, payload);
         }
+
+        return this.updateElectronicPoll(poll, payload);
     }
 
-    private async createAnalogPoll(poll: any): Promise<Identifiable> {
+    private async createAnalogPoll(_poll: any): Promise<Identifiable> {
+        /*
         const payload = {
             meeting_id: this.activeMeetingId,
             title: poll.title,
-            onehundred_percent_base: poll.onehundred_percent_base,
-            pollmethod: poll.pollmethod,
             publish_immediately: poll.publish_immediately,
             type: poll.type,
             global_abstain: poll.global_abstain,
             global_no: poll.global_no,
             global_yes: poll.global_yes,
-            max_votes_amount: poll.max_votes_amount,
-            max_votes_per_option: poll.max_votes_per_option,
-            min_votes_amount: poll.min_votes_amount,
-            description: poll.description,
             options: this.getAnalogOptions(poll.options),
             content_object_id: poll.content_object_id,
             ...this.getAnalogPollVotesValues(poll),
             ...this.getAnalogPollGlobalValues(poll)
         };
         return this.sendActionToBackend(PollAction.CREATE, payload);
+        */
+        throw new Error(`not implemented`);
     }
 
-    private async createElectronicPoll(poll: any): Promise<Identifiable> {
-        const payload = {
-            meeting_id: this.activeMeetingId,
-            title: poll.title,
-            onehundred_percent_base: poll.onehundred_percent_base,
-            pollmethod: poll.pollmethod,
-            type: poll.type,
-            global_abstain: poll.global_abstain,
-            global_no: poll.global_no,
-            global_yes: poll.global_yes,
-            max_votes_amount: poll.max_votes_amount,
-            min_votes_amount: poll.min_votes_amount,
-            max_votes_per_option: poll.max_votes_per_option,
-            description: poll.description,
-            options: this.getElectronicOptions(poll.options),
-            content_object_id: poll.content_object_id,
-            entitled_group_ids: poll.entitled_group_ids,
-            backend: poll.backend,
-            live_voting_enabled: poll.live_voting_enabled
-        };
-
-        if (poll.type !== PollType.Named) {
+    private async createElectronicPoll(payload: PollCreatePayload): Promise<Identifiable> {
+        if (payload.visibility !== PollVisibility.Named) {
             delete payload.live_voting_enabled;
         }
 
-        return this.sendActionToBackend(PollAction.CREATE, payload);
+        return this.voteApi.create(payload);
     }
 
-    private async updateAnalogPoll(update: any, poll: ViewPoll, option: any[]): Promise<void> {
+    private async updateAnalogPoll(_pollId: Id, _payload: PollUpdatePayload): Promise<void> {
+        /*
         let payload: any;
         if (poll.state === PollState.Created) {
             payload = this.getUpdateCreatedAnalogPollPayload(update, poll);
@@ -149,183 +99,66 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             { action: PollAction.UPDATE, data: [payload] },
             { action: PollAction.UPDATE_OPTION, data: optionUpdatePayload }
         ]);
+        */
+        throw new Error(`not implemented`);
     }
 
-    private async updateElectronicPoll(update: any, poll: Poll): Promise<void> {
-        /**
-         * We still want to alter the title and the 100% base after the
-         * poll was saved.
-         *
-         * TODO:
-         * This can be heavily streamlined:
-         * generically, on all "update" (not create) tasks,
-         * compare the current poll with the update and only send
-         * the stuff that is different, since in this
-         * regard the form already only allows to change
-         * title and %base
-         */
-        if (poll.state !== PollState.Created) {
-            update = {
-                title: update.title,
-                onehundred_percent_base: update.onehundred_percent_base
-            };
+    private async updateElectronicPoll(poll: ViewPoll, payload: PollUpdatePayload): Promise<void> {
+        if (poll.config.METHOD_NAME === payload.method) {
+            delete payload[`method`];
         }
-        return this.updateCreatedElectronicPoll(update, poll);
-    }
-
-    public async delete(poll: Identifiable): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        return this.sendActionToBackend(PollAction.DELETE, payload);
-    }
-
-    private getUpdateCreatedAnalogPollPayload(update: any, poll: Poll): any {
-        const payload = {
-            id: poll.id,
-            publish_immediately: update.publish_immediately,
-            allow_multiple_votes_per_candidate: update.allow_multiple_votes_per_candidate,
-            description: update.description,
-            max_votes_amount: update.max_votes_amount,
-            min_votes_amount: update.min_votes_amount,
-            max_votes_per_option: update.max_votes_per_option,
-            onehundred_percent_base: update.onehundred_percent_base,
-            pollmethod: update.pollmethod,
-            title: update.title,
-            ...this.getAnalogPollVotesValues(update)
-        };
-        return payload;
-    }
-
-    private updateOtherStateAnalogPoll(update: any, poll: Poll): any {
-        const payload: any = {
-            id: poll.id,
-            publish_immediately: update.publish_immediately,
-            description: update.description,
-            onehundred_percent_base: update.onehundred_percent_base,
-            title: update.title,
-            ...this.getAnalogPollVotesValues(update)
-        };
-        return payload;
-    }
 
-    private async updateCreatedElectronicPoll(update: any, poll: Poll): Promise<void> {
-        const payload = {
-            id: poll.id,
-            entitled_group_ids: update.entitled_group_ids,
-            allow_multiple_votes_per_candidate: update.allow_multiple_votes_per_candidate,
-            description: update.description,
-            max_votes_amount: update.max_votes_amount,
-            min_votes_amount: update.min_votes_amount,
-            max_votes_per_option: update.max_votes_per_option,
-            onehundred_percent_base: update.onehundred_percent_base,
-            pollmethod: update.pollmethod,
-            title: update.title,
-            backend: update.backend,
-            global_abstain: update.global_abstain,
-            global_no: update.global_no,
-            global_yes: update.global_yes,
-            live_voting_enabled: update.live_voting_enabled
-        };
-        return this.sendActionToBackend(PollAction.UPDATE, payload);
+        return this.voteApi.update(poll.id, payload);
     }
 
-    private getAnalogPollVotesValues(poll: any): AnalogPollVotesValues {
-        return {
-            votescast: toDecimal(poll.votescast, false),
-            votesinvalid: toDecimal(poll.votesinvalid, false),
-            votesvalid: toDecimal(poll.votesvalid, false)
-        };
-    }
-
-    private getAnalogPollGlobalValues(poll: any): AnalogPollGlobalValues {
-        return {
-            amount_global_abstain: toDecimal(poll.amount_global_abstain, false),
-            amount_global_no: toDecimal(poll.amount_global_no, false),
-            amount_global_yes: toDecimal(poll.amount_global_yes, false)
-        };
-    }
-
-    private getAnalogOptions(pollOptions: any[], isUpdate = false): any[] {
-        const result: any[] = [];
-        for (const option of pollOptions) {
-            if (!isUpdate) {
-                this.validateOption(option);
-            } else {
-                delete option.text;
-                delete option.content_object_id;
-                delete option.poll_candidate_user_ids;
-            }
-            result.push({
-                id: option.id,
-                content_object_id: option.content_object_id,
-                text: option.text,
-                poll_candidate_user_ids: option.poll_candidate_user_ids,
-                Y: toDecimal(option.Y, false),
-                A: toDecimal(option.A, false),
-                N: toDecimal(option.N, false)
-            });
-        }
-        return result;
-    }
-
-    private getElectronicOptions(pollOptions: any[]): any[] {
-        const result: any[] = [];
-        for (const option of pollOptions) {
-            this.validateOption(option);
-            result.push({
-                content_object_id: option.content_object_id,
-                text: option.text,
-                poll_candidate_user_ids: option.poll_candidate_user_ids
-            });
-        }
-        return result;
+    public async delete(poll: Identifiable): Promise<void> {
+        return this.voteApi.deletePoll(poll.id);
     }
 
-    private validateOption(option: any): void {
-        if (
-            [option.text, option.content_object_id, option.poll_candidate_user_ids].filter(content => !!content)
-                .length !== 1
-        ) {
-            throw new Error(`Exactly one of text, content_object_id or poll_candidate_user_ids has to be given!`);
-        }
+    /**
+     * This method subscribes to polls and waits until the poll got
+     * voted for or the poll finished
+     *
+     * @param poll The poll that should be subscribed
+     * @return the ViewPoll
+     */
+    public pollBallotsByUser(pollId: Id, meetingUserId: number): Observable<ViewBallot[]> {
+        return this.getViewModelObservable(pollId).pipe(
+            takeWhile(poll => poll.state === PollState.Started),
+            switchMap(poll => poll.ballots$),
+            map(ballots => ballots.filter(b => b.represented_meeting_user_id === meetingUserId))
+        );
     }
 
     public async resetPoll(poll: Identifiable): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        return this.sendActionToBackend(PollAction.RESET, payload);
+        return this.voteApi.reset(poll.id);
     }
 
-    public async anonymize(poll: Identifiable, updateState?: PollState): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        if (updateState === PollState.Published) {
-            return this.sendActionsToBackend(
-                [
-                    { action: PollAction.STOP, data: [payload] },
-                    { action: PollAction.ANONYMIZE, data: [payload] },
-                    { action: PollAction.PUBLISH, data: [payload] }
-                ],
-                true
-            );
-        }
-        return this.sendActionToBackend(PollAction.ANONYMIZE, payload);
+    public async anonymize(poll: Identifiable, publish?: boolean): Promise<void> {
+        return this.voteApi.finalize(poll.id, {
+            anonymize: true,
+            publish
+        });
     }
 
     public async startPoll(poll: Identifiable): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        return this.sendActionToBackend(PollAction.START, payload);
+        return this.voteApi.start(poll.id);
     }
 
     public async stopPoll(poll: Identifiable): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        return this.sendActionToBackend(PollAction.STOP, payload);
+        return this.voteApi.finalize(poll.id, {
+            publish: false
+        });
     }
 
     public async publishPoll(poll: Identifiable): Promise<void> {
-        const payload: Identifiable = { id: poll.id };
-        return this.sendActionToBackend(PollAction.PUBLISH, payload);
+        return this.voteApi.finalize(poll.id, {
+            publish: true
+        });
     }
 
     public async updateOptionForPoll(poll: Poll, update: any): Promise<void> {
-        if (poll.type !== PollType.Analog) {
+        if (!poll.isAnalog) {
             throw new Error(`Cannot update an option for an electronic poll!`);
         }
         const payload = {
@@ -337,10 +170,6 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
         return this.sendActionToBackend(PollAction.UPDATE_OPTION, payload);
     }
 
-    public async vote(poll: Identifiable, options: any): Promise<void> {
-        return this.voteRepo.sendVote(poll.id, options);
-    }
-
     public async changePollState(poll: Identifiable, targetState: PollState): Promise<void> {
         switch (targetState) {
             case PollState.Created:
@@ -352,16 +181,6 @@ export class PollRepositoryService extends BaseMeetingRelatedRepository<ViewPoll
             case PollState.Finished:
                 await this.stopPoll(poll);
                 break;
-            case PollState.Published:
-                return this.publishPoll(poll);
         }
     }
-
-    protected override createViewModel(model: Poll): ViewPoll {
-        const viewPoll = super.createViewModel(model);
-
-        this.voteController.subscribeVoted(viewPoll);
-
-        return viewPoll;
-    }
 }
diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/index.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/index.ts
deleted file mode 100644
index 347e4b9ed9..0000000000
--- a/client/src/app/gateways/repositories/polls/vote-repository.service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './vote-repository.service';
diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts
deleted file mode 100644
index 4005f75387..0000000000
--- a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { VoteRepositoryService } from './vote-repository.service';
-
-xdescribe(`VoteRepositoryService`, () => {
-    let service: VoteRepositoryService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({});
-        service = TestBed.inject(VoteRepositoryService);
-    });
-
-    it(`should be created`, () => {
-        expect(service).toBeTruthy();
-    });
-});
diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts
deleted file mode 100644
index 34be35d030..0000000000
--- a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { Id } from 'src/app/domain/definitions/key-types';
-import { Vote } from 'src/app/domain/models/poll/vote';
-import { HttpService } from 'src/app/gateways/http.service';
-import { ViewPoll, ViewVote } from 'src/app/site/pages/meetings/pages/polls';
-import { OperatorService } from 'src/app/site/services/operator.service';
-
-import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
-import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
-
-const VOTE_URL = `/system/vote`;
-const HAS_VOTED_URL = `${VOTE_URL}/voted`;
-
-/**
- * keys are poll ids,
- * the arrays contain the ids of the users that have voted for the corresponding polls
- */
-export type HasVotedResponse = Record<string, Id[]>;
-
-interface PollSubscription {
-    poll: ViewPoll;
-    users: Id[];
-    current: BehaviorSubject<Id[]>;
-}
-
-export interface VotePayload {
-    user_id: Id;
-    value: any;
-}
-
-@Injectable({
-    providedIn: `root`
-})
-export class VoteRepositoryService extends BaseMeetingRelatedRepository<ViewVote, Vote> {
-    private _subscribedPolls = new Map<Id, PollSubscription>();
-
-    // Interval for workaround until long polling implemented
-    private _fetchVotablePollsInterval = null;
-    private _fetchVotablePollsTimeout = null;
-
-    public constructor(
-        repositoryServiceCollector: RepositoryMeetingServiceCollectorService,
-        private operator: OperatorService,
-        private http: HttpService
-    ) {
-        super(repositoryServiceCollector, Vote);
-    }
-
-    public getTitle = (): string => `Vote`;
-
-    public getVerboseName = (plural = false): string => this.translate.instant(plural ? `Votes` : `Vote`);
-
-    public async sendVote(pollId: Id, payload: VotePayload): Promise<void> {
-        const request: Promise<void> = this.http.post(`${VOTE_URL}?id=${pollId}`, payload);
-        request.then(() => {
-            this.updateSubscription();
-        });
-
-        return request;
-    }
-
-    /**
-     * This method subscribes to polls and waits until the poll got
-     * voted for or the poll finished
-     *
-     * @param poll The poll that should be subscribed
-     * @return the ViewPoll
-     */
-    public subscribeVoted(poll: ViewPoll, userIds?: number[]): BehaviorSubject<Id[]> | null {
-        if (!userIds || !userIds.length) {
-            userIds = [this.operator.operatorId];
-        }
-
-        if (poll.isStarted) {
-            if (!this._subscribedPolls.has(poll.id)) {
-                this._subscribedPolls.set(poll.id, {
-                    poll,
-                    users: userIds,
-                    current: new BehaviorSubject(undefined)
-                });
-                this.updateSubscription();
-            }
-        } else {
-            if (this._subscribedPolls.has(poll.id)) {
-                this._subscribedPolls.get(poll.id).current.complete();
-                this._subscribedPolls.delete(poll.id);
-            }
-
-            return null;
-        }
-
-        return this._subscribedPolls.get(poll.id).current;
-    }
-
-    public updateStartedPolls(polls: Id[]): void {
-        for (const id of this._subscribedPolls.keys()) {
-            if (polls.indexOf(id) === -1) {
-                this._subscribedPolls.get(id).current.complete();
-                this._subscribedPolls.delete(id);
-            }
-        }
-    }
-
-    private updateSubscription(): void {
-        clearTimeout(this._fetchVotablePollsTimeout);
-        this._fetchVotablePollsTimeout = setTimeout(() => {
-            this.requestHasVoted();
-            clearInterval(this._fetchVotablePollsInterval);
-            this._fetchVotablePollsInterval = setInterval(
-                () => {
-                    if (this._subscribedPolls.size) {
-                        this.requestHasVoted();
-                    } else {
-                        clearInterval(this._fetchVotablePollsInterval);
-                    }
-                },
-                8000 + Math.random() * 2000
-            );
-        }, 500);
-    }
-
-    private async requestHasVoted(): Promise<void> {
-        const ids = Array.from(this._subscribedPolls.keys()).filter(
-            id =>
-                !this._subscribedPolls.get(id).current.value ||
-                !this._subscribedPolls.get(id).users.equals(this._subscribedPolls.get(id).current.value)
-        );
-
-        if (!this.activeMeetingId || !ids.length) {
-            return;
-        }
-
-        const results: HasVotedResponse = await this.http.get(`${HAS_VOTED_URL}?ids=${ids.join()}`);
-        for (const pollId of Object.keys(results)) {
-            const subscription = this._subscribedPolls.get(+pollId);
-            const currentVal = subscription.current.value;
-            if (JSON.stringify(currentVal) !== JSON.stringify(results[pollId])) {
-                subscription.current.next(results[pollId]);
-            }
-        }
-    }
-}
diff --git a/client/src/app/gateways/vote-api.service.ts b/client/src/app/gateways/vote-api.service.ts
new file mode 100644
index 0000000000..2991b26c50
--- /dev/null
+++ b/client/src/app/gateways/vote-api.service.ts
@@ -0,0 +1,70 @@
+import { Injectable } from '@angular/core';
+
+import { Id } from '../domain/definitions/key-types';
+import { PollVisibility } from '../domain/models/poll';
+import { HttpService } from './http.service';
+
+export interface PollCreatePayload extends PollUpdatePayload {
+    content_object_id: string;
+    meeting_id: Id;
+}
+
+export interface PollUpdatePayload {
+    title: string;
+    method: string;
+    method_config: unknown;
+    visibility: PollVisibility;
+    entitled_group_ids?: Id[];
+    live_voting_enabled?: boolean;
+    options?: (number | string)[];
+    option_type?: 'text' | 'meeting_user';
+    result?: unknown;
+    allow_vote_split: boolean;
+}
+
+@Injectable({ providedIn: 'root' })
+export class VoteApiService {
+    private readonly BASE = '/system/vote';
+
+    public constructor(private http: HttpService) {}
+
+    public create(payload: PollCreatePayload): Promise<any> {
+        return this.http.post(`${this.BASE}/poll`, payload);
+    }
+
+    public update(id: Id, payload: any): Promise<any> {
+        return this.http.post(`${this.BASE}/poll/${encodeURIComponent(id)}`, payload);
+    }
+
+    public deletePoll(id: Id): Promise<any> {
+        return this.http.delete(`${this.BASE}/poll/${encodeURIComponent(id)}`, {});
+    }
+
+    public start(id: Id): Promise<any> {
+        return this.http.post(`${this.BASE}/poll/${encodeURIComponent(id)}/start`, {});
+    }
+
+    public finalize(id: Id, options?: { publish?: boolean; anonymize?: boolean }): Promise<any> {
+        const url = `${this.BASE}/poll/${encodeURIComponent(id)}/finalize`;
+        const queryParams: Record<string, any> = {};
+        if (options?.publish) {
+            queryParams[`publish`] = ``;
+        }
+        if (options?.anonymize) {
+            queryParams[`anonymize`] = ``;
+        }
+        return this.http.post(url, {}, { queryParams });
+    }
+
+    public reset(id: Id): Promise<any> {
+        return this.http.post(`${this.BASE}/poll/${encodeURIComponent(id)}/reset`, {});
+    }
+
+    public vote(id: Id, value: unknown, meetingUserId: Id, split = false): Promise<any> {
+        return this.http.post(`${this.BASE}/poll/${encodeURIComponent(id)}/vote`, {
+            meeting_user_id: meetingUserId,
+            value,
+            split
+        });
+    }
+}
diff --git a/client/src/app/infrastructure/definitions/relations/relations.ts b/client/src/app/infrastructure/definitions/relations/relations.ts
index a0ddcaf9ef..78b46261ad 100644
--- a/client/src/app/infrastructure/definitions/relations/relations.ts
+++ b/client/src/app/infrastructure/definitions/relations/relations.ts
@@ -21,8 +21,6 @@ import {
     ViewStructureLevel,
     ViewStructureLevelListOfSpeakers
 } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models';
-import { ViewPollCandidate } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate';
-import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
 import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
 import { ViewGender } from 'src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender';
 import { ViewResource } from 'src/app/site/pages/organization/pages/resources';
@@ -55,7 +53,17 @@ import {
     ViewTag
 } from '../../../site/pages/meetings/pages/motions';
 import { ViewGroup } from '../../../site/pages/meetings/pages/participants';
-import { ViewOption, ViewPoll, ViewVote } from '../../../site/pages/meetings/pages/polls';
+import {
+    HasPoll,
+    ViewBallot,
+    ViewPoll,
+    ViewPollConfigApproval,
+    ViewPollConfigRatingApproval,
+    ViewPollConfigRatingScore,
+    ViewPollConfigSelection,
+    ViewPollConfigStvScottish,
+    ViewPollOption
+} from '../../../site/pages/meetings/pages/polls';
 import {
     ViewProjection,
     ViewProjector,
@@ -186,7 +194,7 @@ export const RELATIONS: Relation[] = [
     }),
     // ########## User
     ...makeM2M({
-        AViewModel: ViewUser,
+        AViewModel: ViewMeetingUser,
         BViewModel: ViewPoll,
         AField: `poll_voted`,
         AIdField: `poll_voted_ids`,
@@ -195,13 +203,13 @@ export const RELATIONS: Relation[] = [
     }),
     ...makeM2O({
         OViewModel: ViewUser,
-        MViewModel: ViewVote,
+        MViewModel: ViewBallot,
         OField: `votes`,
         MField: `user`
     }),
     ...makeM2O({
         OViewModel: ViewMeetingUser,
-        MViewModel: ViewVote,
+        MViewModel: ViewBallot,
         OField: `vote_delegated_votes`,
         MField: `delegated_user`
     }),
@@ -314,12 +322,6 @@ export const RELATIONS: Relation[] = [
         many: true,
         generic: false
     },
-    ...makeM2O({
-        OViewModel: ViewUser,
-        MViewModel: ViewPollCandidate,
-        OField: `poll_candidates`,
-        MField: `user`
-    }),
     // ########## Committees
     ...makeM2O({
         OViewModel: ViewCommittee,
@@ -613,14 +615,7 @@ export const RELATIONS: Relation[] = [
     }),
     ...makeM2O({
         OViewModel: ViewMeeting,
-        MViewModel: ViewOption,
-        OField: `options`,
-        MField: `meeting`,
-        isFullList: true
-    }),
-    ...makeM2O({
-        OViewModel: ViewMeeting,
-        MViewModel: ViewVote,
+        MViewModel: ViewBallot,
         OField: `votes`,
         MField: `meeting`,
         isFullList: true
@@ -665,20 +660,6 @@ export const RELATIONS: Relation[] = [
         MField: `meeting`,
         isFullList: true
     }),
-    ...makeM2O({
-        OViewModel: ViewMeeting,
-        MViewModel: ViewPollCandidateList,
-        OField: `poll_candidate_lists`,
-        MField: `meeting`,
-        isFullList: true
-    }),
-    ...makeM2O({
-        OViewModel: ViewMeeting,
-        MViewModel: ViewPollCandidate,
-        OField: `poll_candidates`,
-        MField: `meeting`,
-        isFullList: true
-    }),
     ...makeO2O({
         AViewModel: ViewMeeting,
         BViewModel: ViewProjectorCountdown,
@@ -1004,47 +985,47 @@ export const RELATIONS: Relation[] = [
         AField: `entitled_groups`,
         BField: `polls`
     }),
-    ...makeM2O({
-        MViewModel: ViewOption,
+    ...makeGenericO2O<ViewPoll, HasPoll>({
+        viewModel: ViewPoll,
+        possibleViewModels: [
+            ViewPollConfigSelection,
+            ViewPollConfigRatingApproval,
+            ViewPollConfigRatingScore,
+            ViewPollConfigStvScottish,
+            ViewPollConfigApproval
+        ],
+        viewModelField: `config`,
+        possibleViewModelsField: `poll`
+    }),
+    ...makeGenericO2O<ViewPoll, HasPoll>({
+        viewModel: ViewPoll,
+        possibleViewModels: [
+            ViewPollConfigSelection,
+            ViewPollConfigRatingApproval,
+            ViewPollConfigRatingScore,
+            ViewPollConfigStvScottish,
+            ViewPollConfigApproval
+        ],
+        viewModelField: `config`,
+        possibleViewModelsField: `poll`
+    }),
+    ...makeM2O({
+        MViewModel: ViewPollOption,
         OViewModel: ViewPoll,
         MField: `poll`,
         OField: `options`
     }),
-    ...makeO2O({
-        AViewModel: ViewOption,
-        BViewModel: ViewPoll,
-        AField: `used_as_global_option_in_poll`,
-        BField: `global_option`
+    ...makeM2O({
+        OViewModel: ViewPoll,
+        MViewModel: ViewBallot,
+        OField: `ballots`,
+        MField: `poll`
     }),
-    // ViewOption -> ViewUser, ViewPollCandidateList
-    {
-        ownViewModels: [ViewOption],
-        foreignViewModelPossibilities: [ViewUser, ViewPollCandidateList, ViewMotion],
-        ownField: `content_object`,
-        many: false,
-        generic: true
-    },
-    // ViewUser -> ViewOption
-    {
-        ownViewModels: [ViewUser],
-        foreignViewModel: ViewOption,
-        ownField: `options`,
-        many: true,
-        generic: false
-    },
-    // ViewPollCandidateList -> ViewUser
-    {
-        ownViewModels: [ViewPollCandidateList],
-        foreignViewModel: ViewOption,
-        ownField: `option`,
-        many: false,
-        generic: false
-    },
     ...makeM2O({
-        MViewModel: ViewVote,
-        OViewModel: ViewOption,
-        MField: `option`,
-        OField: `votes`
+        MViewModel: ViewPollOption,
+        OViewModel: ViewMeetingUser,
+        MField: `poll`,
+        OField: `meeting_user`
     }),
     // ########## Assignments
     ...makeM2O({
@@ -1142,13 +1123,6 @@ export const RELATIONS: Relation[] = [
         many: true,
         generic: false
     },
-    // ########## PollCandidateList
-    ...makeM2O({
-        OViewModel: ViewPollCandidateList,
-        MViewModel: ViewPollCandidate,
-        OField: `poll_candidates`,
-        MField: `poll_candidate_list`
-    }),
     // ########## StructureLevel
     ...makeM2O({
         MViewModel: ViewStructureLevelListOfSpeakers,
diff --git a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts
index ac3e178c1c..bb367dc125 100644
--- a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts
+++ b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts
@@ -5,7 +5,7 @@ import { combineLatest, distinctUntilChanged, Subscription } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { viewModelListEqual } from 'src/app/infrastructure/utils';
-import { VoteControllerService } from 'src/app/site/pages/meetings/modules/poll/services/vote-controller.service';
+import { BallotControllerService } from 'src/app/site/pages/meetings/modules/poll/services/vote-controller.service';
 import { VotingService } from 'src/app/site/pages/meetings/modules/poll/services/voting.service';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service';
@@ -37,7 +37,7 @@ export class VotingBannerService {
         private translate: TranslateService,
         private votingService: VotingService,
         private activeMeeting: ActiveMeetingService,
-        private sendVotesService: VoteControllerService,
+        private sendVotesService: BallotControllerService,
         private operator: OperatorService,
         private activePolls: ActivePollsService,
         private meetingSettingsService: MeetingSettingsService
@@ -63,11 +63,11 @@ export class VotingBannerService {
         });
     }
 
-    private updateBanner(polls: ViewPoll[], voted: Record<Id, Id[]>): void {
+    private updateBanner(polls: ViewPoll[], voted: Record<Id, boolean>): void {
         if (this.activeMeeting.meetingId && !this.operator.isAnonymous && this.operator.readyDeferred.wasResolved) {
             const checkUsers = [this.operator.user, ...(this.operator.user.vote_delegations_from() || [])];
             this.pollsToVote = polls.filter(
-                poll => checkUsers.some(user => this.votingService.canVote(poll, user)) && voted[poll.id] !== undefined
+                poll => checkUsers.some(user => this.votingService.canVote(poll, user)) && voted[poll.id] === false
             );
         } else {
             this.pollsToVote = [];
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts
index 05dac00f44..e9823c3f1d 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts
@@ -20,7 +20,7 @@ import { ScrollingTableManageService } from 'src/app/ui/modules/scrolling-table'
 import { GroupControllerService } from '../../../pages/participants/modules/groups/services/group-controller.service';
 import { EntitledUsersTableEntry } from '../definitions';
 import { PollService } from '../services/poll.service';
-import { VoteControllerService } from '../services/vote-controller.service';
+import { BallotControllerService } from '../services/vote-controller.service';
 import { BasePollPdfService } from './base-poll-pdf.service';
 
 export interface BaseVoteData extends Identifiable {
@@ -132,7 +132,7 @@ export abstract class BasePollDetailComponent<V extends PollContentObject, S ext
     protected route = inject(ActivatedRoute);
     protected groupRepo = inject(GroupControllerService);
     protected promptService = inject(PromptService);
-    protected votesRepo = inject(VoteControllerService);
+    protected votesRepo = inject(BallotControllerService);
     protected operator = inject(OperatorService);
     protected cd = inject(ChangeDetectorRef);
     protected userRepo = inject(ParticipantControllerService);
@@ -244,7 +244,8 @@ export abstract class BasePollDetailComponent<V extends PollContentObject, S ext
         }
         const userIds = new Set<number>();
 
-        for (const entry of this.poll.entitled_users_at_stop || []) {
+        // TODO: this.poll.entitled_users_at_stop ||
+        for (const entry of []) {
             userIds.add(entry.user_id);
             if (entry.vote_delegated_to_user_id) {
                 userIds.add(entry.vote_delegated_to_user_id);
@@ -265,7 +266,8 @@ export abstract class BasePollDetailComponent<V extends PollContentObject, S ext
                 )
                 .subscribe(users => {
                     const entries: EntitledUsersTableEntry[] = [];
-                    for (const entry of this.poll.entitled_users_at_stop || []) {
+                    // TODO: this.poll.entitled_users_at_stop ||
+                    for (const entry of []) {
                         entries.push({
                             ...entry,
                             id: entry.user_id,
@@ -317,6 +319,7 @@ export abstract class BasePollDetailComponent<V extends PollContentObject, S ext
                 )
                 .subscribe(users => {
                     const entries: EntitledUsersTableEntry[] = [];
+                    /* TODO: Reenable
                     for (const user of users || []) {
                         const delegateToId = user.vote_delegated_to_id();
                         const voted = this.poll.live_votes && this.poll.live_votes[user.id] !== undefined;
@@ -331,6 +334,7 @@ export abstract class BasePollDetailComponent<V extends PollContentObject, S ext
                             vote_delegated_to: delegateToId ? users.find(utmp => utmp.id === delegateToId) : null
                         });
                     }
+                    */
                     this.countVoteAllowedAndPresent = entries.filter(entry => {
                         const countable = entry.user.isVoteCountable;
                         const inVoteGroup = this.poll.entitled_group_ids.intersect(entry.user.group_ids()).length;
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
index 0cc65eb09e..8ec0440cdf 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts
@@ -1,27 +1,12 @@
-import { Directive, Inject, inject, OnInit, ViewChild } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Directive, inject, viewChild } from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { BehaviorSubject, distinctUntilChanged } from 'rxjs';
 import { Fqid, Id } from 'src/app/domain/definitions/key-types';
-import { Identifiable } from 'src/app/domain/interfaces';
 import { BaseModel } from 'src/app/domain/models/base/base-model';
-import {
-    FormPollMethod,
-    LOWEST_VOTE_VALUE,
-    PollClassType,
-    PollMethod,
-    PollType,
-    VOTE_UNDOCUMENTED,
-    VoteKey,
-    VoteValue,
-    VoteValueVerbose
-} from 'src/app/domain/models/poll';
-import { Option } from 'src/app/domain/models/poll/option';
-import { OneOfValidator } from 'src/app/site/modules/user-components';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
-import { BasePollFormComponent } from '../components/base-poll-form/base-poll-form.component';
+import { PollFormComponent } from '../components/poll-form/poll-form.component';
 
 export interface OptionsObject {
     fqid?: Fqid; // Obligatory if optionTypeText===false and this isn't a list
@@ -38,84 +23,32 @@ export interface OptionsObjectForText {
  * A dialog for updating the values of a poll.
  */
 @Directive()
-export abstract class BasePollDialogComponent extends BaseUiComponent implements OnInit {
-    public dialogVoteForm!: UntypedFormGroup;
-
-    /**
-     * Behaviorsubject for the view:
-     * Is fed with current keys for the options subgroup of dialogVoteForm upon update.
-     */
-    public dialogVoteFormOptionKeysSubject = new BehaviorSubject<string[]>([]);
-
-    public publishImmediately = false;
-
-    /**
-     * If the options of the finished poll should hold text instead of content_object_id,
-     * this variable should be changed to true in the constructor.
-     */
-    protected optionTypeText = false;
-
-    public voteValueVerbose = VoteValueVerbose;
-
-    public pollClassType = PollClassType;
-
-    /**
-     * The summary values that will have fields in the dialog
-     */
-    public readonly sumValues: VoteKey[] = [`votesvalid`, `votesinvalid`, `votescast`];
-
-    /**
-     * vote entries for each option in this component. Is empty if method
-     * requires one vote per candidate
-     */
-    public analogVoteFields: VoteValue[] = [];
-
-    public get isAnalogPoll(): boolean {
-        if (!this.pollForm) {
-            return false;
-        }
-        return this.pollForm.contentForm.get(`type`)!.value === PollType.Analog || false;
-    }
-
-    @ViewChild(BasePollFormComponent, { static: true })
-    protected pollForm: BasePollFormComponent | null = null;
-
-    protected _options: OptionsObject[] = [];
-
-    public get options(): OptionsObject[] {
-        return this._options;
-    }
-
-    public reloading = false;
+export abstract class BasePollDialogComponent extends BaseUiComponent {
+    protected pollForm = viewChild.required(PollFormComponent);
 
     public get formsValid(): boolean {
         if (!this.pollForm) {
             return false;
         }
-        return this.pollForm.contentForm.valid && this.dialogVoteForm?.valid;
-    }
 
-    private isList = false;
+        return this.pollForm().pollForm.valid;
+    }
 
     protected formBuilder = inject(UntypedFormBuilder);
     public dialogRef = inject(MatDialogRef<BasePollDialogComponent>);
+    public pollData: ViewPoll = inject(MAT_DIALOG_DATA);
 
-    public constructor(@Inject(MAT_DIALOG_DATA) public pollData: ViewPoll) {
+    public constructor() {
         super();
         this.addKeyListener();
     }
 
-    public ngOnInit(): void {
-        this.onBeforeInit();
-        this.triggerUpdate(true);
-        this.pollForm.pollMethodChangedToListObservable.pipe(distinctUntilChanged()).subscribe(isList => {
-            this.isList = isList;
-            this.triggerUpdate(true);
-        });
-    }
-
     private addKeyListener(): void {
-        if (this.dialogRef) {
+        if (!this.dialogRef) {
+            return;
+        }
+
+        this.subscriptions.push(
             this.dialogRef.keydownEvents().subscribe((event: KeyboardEvent) => {
                 if (event.key === `Enter` && event.shiftKey) {
                     this.submitPoll();
@@ -124,283 +57,12 @@ export abstract class BasePollDialogComponent extends BaseUiComponent implements
                 if (event.key === `Escape`) {
                     this.dialogRef.close();
                 }
-            });
-        }
-    }
-
-    /**
-     * Submits the values from dialog.
-     */
-    public submitPoll(): void {
-        const pollForm = this.pollForm?.getValues();
-        const voteForm = this.dialogVoteForm.value;
-        const payload: any = { ...pollForm, ...voteForm, publish_immediately: this.publishImmediately };
-        payload.options = this.getOptions(voteForm.options, payload.pollmethod === FormPollMethod.LIST_YNA);
-        this.formatPayload(payload);
-        this.dialogRef.close(payload);
-    }
-
-    private formatPayload(payload: any): void {
-        payload.pollmethod = (payload.pollmethod as FormPollMethod).toUpperCase();
-        if (this.isList) {
-            payload.min_votes_amount = 1;
-            payload.max_votes_amount = 1;
-        }
-    }
-
-    /**
-     * Handles the state-change of the checkbox `Publish immediately`.
-     *
-     * If it is checked, at least one of the fields have to be filled.
-     *
-     * @param checked The next state.
-     */
-    public publishStateChanged(checked: boolean): void {
-        if (checked) {
-            this.dialogVoteForm.setValidators(OneOfValidator.validation(Object.keys(this.dialogVoteForm.controls)));
-        } else {
-            this.dialogVoteForm.setValidators(null);
-        }
-    }
-
-    public getVoteData(): object | undefined {
-        if (this.isVoteDataEmpty(this.dialogVoteForm.value)) {
-            return undefined;
-        }
-        return this.replaceEmptyValues(this.dialogVoteForm.value);
-    }
-
-    public calculateOptionKey(option: OptionsObject): string {
-        return option.fqid ?? option.poll_candidate_user_ids.join(`, `);
-    }
-
-    /**
-     * @return Must return BaseModel in case of object-based options (optionTypeText===false)
-     * and string in case of text-based options (optionTypeText===true)
-     */
-    protected abstract getContentObjectsForOptions(): BaseModel[] | { text: string }[];
-    protected abstract getAnalogVoteFields(): VoteValue[];
-    protected onBeforeInit(): void {}
-
-    protected triggerUpdate(createOptions = false): void {
-        if (createOptions) {
-            this.reloading = true;
-            this.createOptions();
-        }
-        this.analogVoteFields = this.getAnalogVoteFields();
-        this.createDialog();
-        this.reloading = false;
-    }
-
-    /**
-     * reverses the replacement of empty values by VOTE_UNDOCUMENTED; replaces each
-     * VOTE_UNDOCUMENTED with null
-     *
-     * @param voteData the vote data
-     */
-    protected undoReplaceEmptyValues(voteData: object): object {
-        return this.replaceEmptyValues(voteData, true);
-    }
-
-    /**
-     * check recursively whether the given vote data object is empty, meaning all values would
-     * be VOTE_UNDOCUMENTED when sent
-     *
-     * @param voteData the (partial) vote data
-     */
-    private isVoteDataEmpty(voteData: object): boolean {
-        return Object.values(voteData).every(
-            value => !value || (typeof value === `object` && this.isVoteDataEmpty(value))
+            })
         );
     }
 
     /**
-     * iterates over the given data and returns a new object with all empty fields recursively
-     * replaced with VOTE_UNDOCUMENTED
-     * @param voteData the (partial) data
-     */
-    private replaceEmptyValues(voteData: any, undo = false): object {
-        const result: any = {};
-        for (const key of Object.keys(voteData)) {
-            if (typeof voteData[key] === `object` && voteData[key]) {
-                result[key] = this.replaceEmptyValues(voteData[key], undo);
-            } else {
-                if (undo) {
-                    result[key] = voteData[key] === VOTE_UNDOCUMENTED ? null : voteData[key];
-                } else {
-                    result[key] = voteData[key] ? voteData[key] : VOTE_UNDOCUMENTED;
-                }
-            }
-        }
-        return result;
-    }
-
-    private getOptions(options: any, is_list_poll = false): (Partial<Option> & Identifiable)[] {
-        const result: any[] = [];
-        const optionKeys = Object.keys(options);
-        if (is_list_poll) {
-            result.push({
-                ...options[optionKeys[0]],
-                id: this.pollData.poll?.option_ids[0],
-                poll_candidate_user_ids: optionKeys[0].split(`, `).map(element => Number(element))
-            });
-        } else {
-            for (let index = 0; index < optionKeys.length; ++index) {
-                if (this.optionTypeText === false) {
-                    result.push({
-                        ...options[optionKeys[index]],
-                        id: this.pollData.poll?.option_ids[index],
-                        content_object_id: optionKeys[index]
-                    });
-                } else {
-                    result.push({
-                        ...options[optionKeys[index]],
-                        id: this.pollData.poll?.option_ids[index]
-                    });
-                }
-            }
-        }
-        return result;
-    }
-
-    private createOptions(): void {
-        if (this.pollData) {
-            if (this.pollData instanceof ViewPoll) {
-                this._options = this.pollData.options;
-            } else if (this.optionTypeText === false) {
-                if (!this.isList) {
-                    this._options = this.getContentObjectsForOptions().map(
-                        contentObject => ({
-                            fqid: contentObject.fqid,
-                            content_object: contentObject
-                        }),
-                        {}
-                    );
-                } else {
-                    const contentObjects = this.getContentObjectsForOptions();
-                    this._options = [
-                        {
-                            poll_candidate_user_ids: contentObjects.map(obj => obj.id)
-                        }
-                    ];
-                }
-            } else {
-                this._options = this.getContentObjectsForOptions();
-            }
-        }
-    }
-
-    /**
-     * Create a form group for each option with the user id as key
-     */
-    private createOptionsForVoteForm(): Record<string, any> {
-        const isListPoll = this.pollForm.getValues().pollmethod === FormPollMethod.LIST_YNA;
-        if (this.optionTypeText === false && !isListPoll) {
-            // with content_object_id
-            return this.options?.mapToObject(option => ({
-                [option.fqid]: this.formBuilder.group(
-                    // for each user, create a form group with a control for each valid input (Y, N, A)
-                    this.analogVoteFields?.mapToObject(value => ({
-                        [value]: [``, [Validators.min(LOWEST_VOTE_VALUE)]]
-                    }))
-                )
-            }));
-        } else if (isListPoll) {
-            return {
-                [this.options[0].poll_candidate_user_ids?.join(`, `)]: this.formBuilder.group(
-                    // Create a form group with a control for each valid input (Y, N, A)
-                    this.analogVoteFields?.mapToObject(value => ({
-                        [value]: [``, [Validators.min(LOWEST_VOTE_VALUE)]]
-                    }))
-                )
-            };
-        } else {
-            // with text
-            // get a unique key
-            let key = 0;
-            return this.options?.mapToObject(option => {
-                key++;
-                return {
-                    [key.toString(10)]: this.formBuilder.group(
-                        // The text for the option
-                        {
-                            text: [[option.text], [Validators.required]],
-                            // for each user, create a form group with a control for each valid input (Y, N, A)
-                            ...this.analogVoteFields?.mapToObject(value => ({
-                                [value]: [``, [Validators.min(LOWEST_VOTE_VALUE)]]
-                            }))
-                        }
-                    )
-                };
-            });
-        }
-    }
-
-    /**
-     * Pre-executed method to initialize the dialog-form depending on the poll-method.
+     * Submits the values from dialog.
      */
-    private createDialog(): void {
-        if (this._options) {
-            this.dialogVoteForm = this.formBuilder.group({
-                options: this.formBuilder.group(
-                    // create a form group for each option with the user id as key
-                    this.createOptionsForVoteForm()
-                ),
-                amount_global_yes: [``, [Validators.min(LOWEST_VOTE_VALUE)]],
-                amount_global_no: [``, [Validators.min(LOWEST_VOTE_VALUE)]],
-                amount_global_abstain: [``, [Validators.min(LOWEST_VOTE_VALUE)]],
-                // insert all used global fields
-                ...this.sumValues?.mapToObject(sumValue => ({
-                    [sumValue]: [``, [Validators.min(LOWEST_VOTE_VALUE)]]
-                }))
-            });
-            this.updateDialogVoteFormOptionKeysSubject();
-            setTimeout(() => {
-                if (this.isAnalogPoll && this.pollData instanceof ViewPoll) {
-                    this.updateDialogVoteForm(this.pollData);
-                }
-            });
-        }
-    }
-
-    private updateDialogVoteForm(data: Partial<ViewPoll>): void {
-        const update: any = {
-            options: {},
-            votesvalid: data.votesvalid,
-            votesinvalid: data.votesinvalid,
-            votescast: data.votescast,
-            amount_global_yes: data.global_option?.yes,
-            amount_global_no: data.global_option?.no,
-            amount_global_abstain: data.global_option?.abstain
-        };
-        for (const option of data.options || []) {
-            const votes: any = {};
-            votes.Y = option.yes;
-            if (data.pollmethod !== PollMethod.Y) {
-                votes.N = option.no;
-            }
-            if (data.pollmethod.toUpperCase() === FormPollMethod.YNA) {
-                votes.A = option.abstain;
-            }
-            update.options[option.fqid] = votes;
-        }
-
-        if (this.dialogVoteForm) {
-            const result = this.undoReplaceEmptyValues(update);
-            this.dialogVoteForm.patchValue(result);
-        }
-    }
-
-    public get optionsFromVoteForm(): UntypedFormGroup | null {
-        const dialogVoteFormControls = this.dialogVoteForm?.controls;
-        if (dialogVoteFormControls && !!dialogVoteFormControls[`options`]) {
-            return dialogVoteFormControls[`options`] as UntypedFormGroup;
-        } else {
-            return null;
-        }
-    }
-
-    public updateDialogVoteFormOptionKeysSubject(): void {
-        this.dialogVoteFormOptionKeysSubject.next(Object.keys(this.optionsFromVoteForm.controls));
-    }
+    public abstract submitPoll(): void;
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts
index d468912e1d..ece79f0afa 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts
@@ -1,10 +1,11 @@
 import { ComponentType } from '@angular/cdk/portal';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { firstValueFrom } from 'rxjs';
 import { PollContentObject } from 'src/app/domain/models/poll';
+import { PollCreatePayload } from 'src/app/gateways/vote-api.service';
 import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
-import { PollDialogData, PollDialogResult } from 'src/app/site/pages/meetings/modules/poll/definitions';
+import { PollDialogData } from 'src/app/site/pages/meetings/modules/poll/definitions';
 import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 
@@ -12,35 +13,34 @@ import { PollServiceModule } from '../services/poll-service.module';
 
 @Injectable({ providedIn: PollServiceModule })
 export abstract class BasePollDialogService<V extends PollContentObject, C = any> {
-    public constructor(
-        private controller: PollControllerService,
-        private dialogService: MatDialog
-    ) {}
+    private controller = inject(PollControllerService);
+    private dialogService = inject(MatDialog);
 
     public async open(data: Partial<PollDialogData> | ViewPoll<V>): Promise<void> {
-        const dialogRef = this.dialogService.open<C, Partial<PollDialogData> | ViewPoll<V>, PollDialogResult>(
+        const dialogRef = this.dialogService.open<C, Partial<PollDialogData> | ViewPoll<V>, Partial<PollCreatePayload>>(
             this.getComponent(),
             {
                 ...mediumDialogSettings,
                 data
             }
         );
+
         const result = await firstValueFrom(dialogRef.afterClosed());
         if (result) {
             if (data instanceof ViewPoll) {
                 this.update(result, data);
             } else {
-                this.create(result);
+                this.create(result, data);
             }
         }
     }
 
-    protected async create(payload: any): Promise<void> {
-        await this.controller.create(payload);
+    protected async create(payload: any, data: Partial<PollDialogData>): Promise<void> {
+        await this.controller.create(data.content_object, payload);
     }
 
     protected async update(payload: any, poll: ViewPoll): Promise<void> {
-        await this.controller.update(payload, poll);
+        await this.controller.update(poll, payload);
     }
 
     protected abstract getComponent(): ComponentType<C>;
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts
deleted file mode 100644
index 3de59e2616..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Directive, Input } from '@angular/core';
-import { PollBackendDurationChoices } from 'src/app/domain/models/poll/poll-constants';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
-
-@Directive()
-export abstract class BasePollMetaInformationComponent {
-    public readonly POLL_BACKEND_DURATION_LABEL = PollBackendDurationChoices;
-
-    @Input()
-    public poll!: ViewPoll;
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts
index f7fb6063b5..bc85af2008 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts
@@ -3,9 +3,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { Content, ContentText, StyleDictionary, TDocumentDefinitions } from 'pdfmake/interfaces';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { BallotPaperSelection } from 'src/app/domain/models/meetings/meeting.constants';
-import { PollMethod, PollTableData, PollType, VoteValuesVerbose, VotingResult } from 'src/app/domain/models/poll';
+import { PollTableData, PollVisibility, VoteValuesVerbose, VotingResult } from 'src/app/domain/models/poll';
 import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service';
-import { ViewOption, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
+import { ViewPoll, ViewPollConfigSelection, ViewPollOption } from 'src/app/site/pages/meetings/pages/polls';
 import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service';
 import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export';
 import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service';
@@ -290,7 +290,7 @@ export abstract class BasePollPdfService {
     }
 
     protected getRowsPerPage(poll: ViewPoll): number {
-        if (poll.pollmethod === PollMethod.Y) {
+        if (poll.config instanceof ViewPollConfigSelection) {
             if (poll.options.length <= 2) {
                 return 4;
             } else if (poll.options.length <= 5) {
@@ -381,14 +381,15 @@ export abstract class BasePollPdfService {
             pollResultPdfContent.push(resultsData);
         }
 
-        if (exportInfo.votesData?.length && poll.type !== PollType.Analog) {
+        if (exportInfo.votesData?.length && !poll.isAnalog) {
             pollResultPdfContent.push({
                 text: this.translate.instant(`Single votes`),
                 margin: [0, 20, 0, 5],
                 bold: true
             });
-            const votesData = this.createVotesTable(exportInfo.votesData, poll.type);
-            pollResultPdfContent.push(votesData);
+            // TODO: Reenable
+            // const votesData = this.createVotesTable(exportInfo.votesData, poll.type);
+            // pollResultPdfContent.push(votesData);
         }
 
         if (exportInfo.entitledUsersData?.length) {
@@ -409,7 +410,7 @@ export abstract class BasePollPdfService {
      *
      * @returns the table as pdfmake object
      */
-    private createListEntriesTable(option: ViewOption, enumerate = false): object {
+    private createListEntriesTable(option: ViewPollOption, enumerate = false): object {
         if (!option.isListOption) {
             throw new Error(`Can't generate entry list for non-list option`);
         }
@@ -479,10 +480,11 @@ export abstract class BasePollPdfService {
      */
     private createResultsTable(poll: ViewPoll, resultsTableData: PollTableData[]): object {
         const resultsTable = (JSON.parse(JSON.stringify(resultsTableData)) as PollTableData[]).map(date => {
-            const forbidden = [`yes`, `no`, `abstain`].filter(
-                option => !poll.pollmethod.includes(option.charAt(0).toUpperCase())
-            );
-            date.value = date.value?.filter(val => !forbidden.includes(val.vote));
+            // TODO: Reimplement
+            // const forbidden = [`yes`, `no`, `abstain`].filter(
+            //     option => !poll.pollmethod.includes(option.charAt(0).toUpperCase())
+            // );
+            // date.value = date.value?.filter(val => !forbidden.includes(val.vote));
             return date;
         });
         const amountColumns = Math.max(...resultsTable.map(row => row.value.length));
@@ -566,9 +568,10 @@ export abstract class BasePollPdfService {
      *
      * @returns the table as pdfmake object
      */
-    private createVotesTable(votesData: BaseVoteData[], pollType: PollType): object {
+    private createVotesTable(votesData: BaseVoteData[], pollVisibility: PollVisibility): object {
         const isAnonymised: boolean = votesData[0].user ? false : true;
-        const showVoteWeight: boolean = this.activeVoteWeight && pollType == PollType.Named && !isAnonymised;
+        const showVoteWeight: boolean =
+            this.activeVoteWeight && pollVisibility == PollVisibility.Named && !isAnonymised;
         let pollTableBody: any[] = [];
         const pollTableHeader = [
             {
diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts
index 40c8dd79f9..8cb0bc31d7 100644
--- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts
@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { PollContentObject } from 'src/app/domain/models/poll';
-import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants';
+import { PollState } from 'src/app/domain/models/poll/poll-constants';
 import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { ChoiceService } from 'src/app/ui/modules/choice-dialog';
@@ -38,15 +38,11 @@ export abstract class BasePollComponent<C extends PollContentObject = any> exten
         [PollState.Finished]: {
             icon: `public`,
             css: `publish-poll-button`
-        },
-        [PollState.Published]: {
-            icon: ``,
-            css: ``
         }
     };
 
     public get hideChangeState(): boolean {
-        return this._poll.isPublished || (this._poll.isCreated && this._poll.type === PollType.Analog);
+        return this._poll.isPublished || (this._poll.isCreated && this._poll.isAnalog);
     }
 
     protected _id!: Id;
@@ -60,7 +56,11 @@ export abstract class BasePollComponent<C extends PollContentObject = any> exten
     public async nextPollState(): Promise<void> {
         const currentState: PollState = this._poll.state;
         if (currentState === PollState.Created || currentState === PollState.Finished) {
-            await this.changeState(this._poll.nextState);
+            if (this._poll.nextState === `published`) {
+                this.repo.publish(this._poll);
+            } else {
+                await this.changeState(this._poll.nextState);
+            }
         } else if (currentState === PollState.Started) {
             const title = this.translate.instant(`Are you sure you want to stop this voting?`);
             const STOP_LABEL = this.translate.instant(`Stop`);
@@ -75,9 +75,9 @@ export abstract class BasePollComponent<C extends PollContentObject = any> exten
             if (choice?.action === STOP_LABEL) {
                 await this.changeState(PollState.Finished);
             } else if (choice?.action === STOP_PUBLISH_LABEL) {
-                await this.changeState(PollState.Published);
+                await this.repo.publish(this.poll).catch(this.raiseError);
             } else if (choice?.action === STOP_PUBLISH_ANONYMIZE_LABEL) {
-                await this.repo.anonymize(this.poll, PollState.Published).catch(this.raiseError);
+                await this.repo.anonymize(this.poll, true).catch(this.raiseError);
             }
         }
     }
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html
deleted file mode 100644
index b9775e9d05..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<div class="os-form-card-mobile">
-    <!-- Poll Title -->
-    <form [formGroup]="contentForm">
-        <mat-form-field>
-            <mat-label>{{ 'Title' | translate }}</mat-label>
-            <h2 class="poll-preview-title">
-                <input formControlName="title" matInput required />
-            </h2>
-        </mat-form-field>
-    </form>
-
-    <form class="poll-preview-meta-info-form" [formGroup]="contentForm">
-        @if (!data || !data.state || data.isCreated) {
-            <div class="info-grid">
-                <!-- Poll Type -->
-                @if (isEVotingEnabled && !hideSelects.type) {
-                    <mat-form-field>
-                        <mat-label>{{ PollPropertyVerbose.type | translate }}</mat-label>
-                        <mat-select formControlName="type" required>
-                            @for (option of pollTypes | keyvalue; track option) {
-                                <mat-option [value]="option.key">
-                                    {{ option.value | translate }}
-                                </mat-option>
-                            }
-                        </mat-select>
-                        @if (showNonNominalWarning) {
-                            <mat-icon color="primary" matSuffix (click)="openVotingWarning($event)">info</mat-icon>
-                        }
-                        <mat-error>{{ 'This field is required.' | translate }}</mat-error>
-                    </mat-form-field>
-                }
-                <!-- Groups entitled to Vote -->
-                @if (isEVotingSelected && !hideSelects.entitledGroups) {
-                    <mat-form-field>
-                        <mat-label>{{ PollPropertyVerbose.groups | translate }}</mat-label>
-                        <os-repo-search-selector
-                            formControlName="entitled_group_ids"
-                            [multiple]="true"
-                            [pipeFn]="groupRepo.getFilterSystemGroupFn()"
-                            [repo]="groupRepo"
-                            [showChips]="false"
-                            [sortFn]="sortFn"
-                        ></os-repo-search-selector>
-                    </mat-form-field>
-                }
-            </div>
-            <div class="margin-bottom-15">
-                <!-- Live voting -->
-                @if (isLiveVotingAvailable) {
-                    <mat-checkbox formControlName="live_voting_enabled">
-                        {{ PollPropertyVerbose.live_voting_enabled | translate }}
-                    </mat-checkbox>
-                    <mat-hint>
-                        {{ 'Allows single votes projection during voting process' | translate }}
-                    </mat-hint>
-                }
-            </div>
-            <div class="flex-info-grid">
-                <!-- Poll Methods -->
-                @if (!isCreatedList && filteredPollMethods && !hideSelects.pollMethod) {
-                    <mat-form-field class="first">
-                        <mat-label>{{ PollPropertyVerbose.pollmethod | translate }}</mat-label>
-                        <mat-select formControlName="pollmethod" required>
-                            @for (option of filteredPollMethods | keyvalue: keepEntryOrder; track option) {
-                                <mat-option [value]="option.key">
-                                    {{ option.value | translate }}
-                                </mat-option>
-                            }
-                        </mat-select>
-                        <mat-error>{{ 'This field is required.' | translate }}</mat-error>
-                    </mat-form-field>
-                }
-                @if (isEVotingSelected) {
-                    <ng-container formGroupName="votes_amount">
-                        <!-- Min Amount of Votes -->
-                        @if (showMinMaxVotes(data)) {
-                            <mat-form-field class="second" subscriptSizing="dynamic">
-                                <mat-label>{{ PollPropertyVerbose.min_votes_amount | translate }}</mat-label>
-                                <input
-                                    formControlName="min_votes_amount"
-                                    matInput
-                                    min="1"
-                                    required
-                                    type="number"
-                                    [errorStateMatcher]="parentErrorStateMatcher"
-                                />
-                                @if (contentForm.controls['votes_amount'].hasError('notEnoughOptionsError')) {
-                                    <mat-error>{{ getErrorMessage('notEnoughOptionsError') }}</mat-error>
-                                }
-                                @if (contentForm.controls['votes_amount'].hasError('rangeError')) {
-                                    <mat-error>{{ getErrorMessage('rangeError') }}</mat-error>
-                                }
-                            </mat-form-field>
-                        }
-                        <!-- Max Amount of Votes -->
-                        @if (showMinMaxVotes(data)) {
-                            <mat-form-field class="third">
-                                <mat-label>{{ PollPropertyVerbose.max_votes_amount | translate }}</mat-label>
-                                <input
-                                    formControlName="max_votes_amount"
-                                    matInput
-                                    min="1"
-                                    required
-                                    type="number"
-                                    [errorStateMatcher]="parentErrorStateMatcher"
-                                />
-                                @if (contentForm.controls['votes_amount']?.get('max_votes_amount').hasError('max')) {
-                                    <mat-error>{{ getErrorMessage('max') }}</mat-error>
-                                }
-                            </mat-form-field>
-                        }
-                    </ng-container>
-                }
-                <!-- Second row with span over 2nd and 3rd column if max amount of votes per option is enabled-->
-                @if (pollService.isMaxVotesPerOptionEnabled() && isEVotingSelected && showMaxVotesPerOption(data)) {
-                    <div class="fourth">
-                        <ng-container formGroupName="votes_amount">
-                            <!-- Max Amount of Votes per Option -->
-                            <mat-form-field subscriptSizing="dynamic">
-                                <mat-label>{{ PollPropertyVerbose.max_votes_per_option | translate }}</mat-label>
-                                <input
-                                    formControlName="max_votes_per_option"
-                                    matInput
-                                    min="1"
-                                    required
-                                    type="number"
-                                    [errorStateMatcher]="parentErrorStateMatcher"
-                                />
-                                @if (contentForm.controls['votes_amount'].hasError('rangeErrorMaxPerOption')) {
-                                    <mat-error>{{ getErrorMessage('rangeErrorMaxPerOption') }}</mat-error>
-                                }
-                            </mat-form-field>
-                        </ng-container>
-                    </div>
-                }
-            </div>
-            <!-- Amount of Votes and global options -->
-            @if (!hideSelects.globalOptions) {
-                <div class="global-options">
-                    <mat-checkbox formControlName="global_yes">
-                        {{ PollPropertyVerbose.global_yes | translate }}
-                    </mat-checkbox>
-                    <mat-checkbox formControlName="global_no">
-                        {{ PollPropertyVerbose.global_no | translate }}
-                    </mat-checkbox>
-                    <mat-checkbox formControlName="global_abstain">
-                        {{ PollPropertyVerbose.global_abstain | translate }}
-                    </mat-checkbox>
-                </div>
-            }
-        }
-
-        <div class="info-grid">
-            <!-- 100 Percent Base -->
-            <div>
-                @if (!hideSelects.hundredPercentBase) {
-                    <mat-form-field>
-                        <mat-label>{{ PollPropertyVerbose.onehundred_percent_base | translate }}</mat-label>
-                        <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
-                            @for (option of validPercentBases | keyvalue: keepEntryOrder; track option) {
-                                <mat-option [value]="option.key">
-                                    {{
-                                        (isCreatedList || pollMethod === 'yna'
-                                            ? alternativePercentBases[option.key]
-                                            : option.value
-                                        ) | translate
-                                    }}
-                                </mat-option>
-                            }
-                        </mat-select>
-                    </mat-form-field>
-                }
-            </div>
-            <div>
-                @if (isEVotingSelected && isCreated && !hideSelects.backendDuration) {
-                    <mat-form-field subscriptSizing="dynamic">
-                        <mat-label>{{ 'Voting duration' | translate }}</mat-label>
-                        <mat-select formControlName="backend" required>
-                            @for (option of pollBackendDurationChoices | keyvalue; track option) {
-                                <mat-option [value]="option.key">
-                                    {{ option.value | translate }}
-                                </mat-option>
-                            }
-                        </mat-select>
-                        <mat-hint
-                            [innerText]="
-                                'Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.'
-                                    | translate
-                            "
-                        ></mat-hint>
-                    </mat-form-field>
-                }
-            </div>
-        </div>
-    </form>
-</div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts
deleted file mode 100644
index 0053258050..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts
+++ /dev/null
@@ -1,668 +0,0 @@
-import { Directive, inject, Input, OnInit } from '@angular/core';
-import {
-    AbstractControl,
-    UntypedFormBuilder,
-    UntypedFormControl,
-    UntypedFormGroup,
-    ValidatorFn,
-    Validators
-} from '@angular/forms';
-import { combineLatest, distinctUntilChanged, map, Observable, startWith } from 'rxjs';
-import {
-    FormPollMethod,
-    PollBackendDurationChoices,
-    PollClassType,
-    PollMethod,
-    PollPercentBase,
-    PollPercentBaseVerbose,
-    PollPropertyVerbose,
-    PollPropertyVerboseKey,
-    PollType,
-    PollTypeVerbose
-} from 'src/app/domain/models/poll';
-import { isNumberRange } from 'src/app/infrastructure/utils/validators';
-import { BaseComponent } from 'src/app/site/base/base.component';
-import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators';
-
-import { GroupControllerService, ViewGroup } from '../../../../pages/participants';
-import { ViewPoll } from '../../../../pages/polls';
-import { MeetingSettingsService } from '../../../../services/meeting-settings.service';
-import { VotingPrivacyWarningDialogService } from '../../modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service';
-import { PollService } from '../../services/poll.service';
-
-/**
- * Interface for determining, which choices are presented to the user in the poll-form.
- * If a certain choice needs to be hidden, the corresponding attribute in this interface needs to be set to true.
- */
-export interface PollFormHideSelectsData {
-    type?: boolean;
-    entitledGroups?: boolean;
-    pollMethod?: boolean;
-    globalOptions?: boolean;
-    hundredPercentBase?: boolean;
-    backendDuration?: boolean;
-}
-
-@Directive()
-export abstract class BasePollFormComponent extends BaseComponent implements OnInit {
-    /**
-     * The form-group for the meta-info.
-     */
-    public contentForm: UntypedFormGroup;
-    public parentErrorStateMatcher = new ParentErrorStateMatcher();
-
-    public PollType = PollType;
-    public PollPropertyVerbose: Record<PollPropertyVerboseKey, string> = PollPropertyVerbose;
-    public readonly pollBackendDurationChoices = PollBackendDurationChoices;
-
-    /**
-     * The different methods for this poll.
-     */
-    @Input()
-    public pollMethods: Record<string, string>;
-
-    /**
-     * The different percent bases for this poll.
-     */
-    @Input()
-    public percentBases: Record<string, string>;
-
-    public alternativePercentBases = PollPercentBaseVerbose;
-
-    @Input()
-    public set data(data: Partial<ViewPoll>) {
-        this._data = data;
-        this.isCreatedList = data.isListPoll;
-    }
-
-    public get data(): Partial<ViewPoll> {
-        return this._data;
-    }
-
-    /**
-     * The flag to allow min/max votes on YNA and YN poll method
-     */
-    @Input()
-    public allowToSetMinMax = false;
-
-    public isCreatedList: boolean;
-
-    public get isList(): boolean {
-        return this.pollMethod === FormPollMethod.LIST_YNA || this.isCreatedList;
-    }
-
-    public get filteredPollMethods(): Record<string, string> {
-        if (!this.isCreatedList || !this.pollMethods) {
-            return this.pollMethods;
-        }
-        return Object.keys(this.pollMethods).reduce(
-            (obj, key) => (key === key.toUpperCase() ? { ...obj, [key]: this.pollMethods[key] } : obj),
-            {}
-        );
-    }
-
-    public sortFn = (groupA: ViewGroup, groupB: ViewGroup): number => groupA.weight - groupB.weight;
-
-    private _data: Partial<ViewPoll>;
-
-    @Input()
-    public pollOptionAmount: number;
-
-    @Input()
-    public pollService!: PollService;
-
-    @Input()
-    public pollClassType: PollClassType;
-
-    /**
-     * The different types the poll can accept.
-     */
-    @Input()
-    public pollTypes = PollTypeVerbose;
-
-    /**
-     * the filtered `percentBases`.
-     */
-    public validPercentBases: Record<string, string>;
-
-    /**
-     * An twodimensional array to handle constant values for this poll.
-     */
-    public pollValues: [string, unknown][] = [];
-
-    public showNonNominalWarning = false;
-
-    public get isEVotingEnabled(): boolean {
-        if (this.pollService) {
-            return this.pollService.isElectronicVotingEnabled;
-        } else {
-            return false;
-        }
-    }
-
-    public get isCreated(): boolean {
-        return !this.data.state || this.data.isCreated; // no state means, its under creation
-    }
-
-    public get isNamedVotingSelected(): boolean {
-        return this.pollTypeControl?.value === PollType.Named || false;
-    }
-
-    public get isEVotingSelected(): boolean {
-        return this.pollTypeControl?.value !== PollType.Analog || false;
-    }
-
-    private get pollTypeControl(): AbstractControl {
-        return this.contentForm.get(`type`);
-    }
-
-    private get pollMethodControl(): AbstractControl {
-        return this.contentForm.get(`pollmethod`);
-    }
-
-    private get isPollMethodYNA(): boolean {
-        return (this.contentForm?.get(`pollmethod`)?.value as PollMethod) === PollMethod.YNA;
-    }
-
-    private get isPollMethodYN(): boolean {
-        return (this.contentForm?.get(`pollmethod`)?.value as PollMethod) === PollMethod.YN;
-    }
-
-    public get pollMethod(): FormPollMethod {
-        return this.pollMethodControl.value as FormPollMethod;
-    }
-
-    private get globalYesControl(): AbstractControl {
-        return this.contentForm.get(`global_yes`);
-    }
-
-    private get globalNoControl(): AbstractControl {
-        return this.contentForm.get(`global_no`);
-    }
-
-    private get globalAbstainControl(): AbstractControl {
-        return this.contentForm.get(`global_abstain`);
-    }
-
-    private get percentBaseControl(): AbstractControl {
-        return this.contentForm.get(`onehundred_percent_base`);
-    }
-
-    private get liveVotingControl(): AbstractControl {
-        return this.contentForm.get(`live_voting_enabled`);
-    }
-
-    public abstract get hideSelects(): PollFormHideSelectsData;
-
-    public get pollMethodChangedToListObservable(): Observable<boolean> {
-        return this.pollMethodControl.valueChanges.pipe(map(method => method === FormPollMethod.LIST_YNA));
-    }
-
-    public get isMotionPoll(): boolean {
-        return this.pollClassType === PollClassType.Motion;
-    }
-
-    private get isAssignmentPoll(): boolean {
-        return this.pollClassType === PollClassType.Assignment;
-    }
-
-    public get isLiveVotingAvailable(): boolean {
-        return (
-            this.isEVotingSelected &&
-            this.isNamedVotingSelected &&
-            (this.isMotionPoll ||
-                (this.isAssignmentPoll &&
-                    !this.globalYesControl?.value &&
-                    this.pollMethod === FormPollMethod.Y &&
-                    this.contentForm.get(`votes_amount`).get(`max_votes_amount`).value === 1))
-        );
-    }
-
-    private fb = inject(UntypedFormBuilder);
-    public groupRepo = inject(GroupControllerService);
-    private dialog = inject(VotingPrivacyWarningDialogService);
-    protected meetingSettingsService = inject(MeetingSettingsService);
-    /**
-     * Constructor. Retrieves necessary metadata from the pollService,
-     * injects the poll itself
-     */
-    public constructor() {
-        super();
-        this.initContentForm();
-    }
-
-    /**
-     * OnInit.
-     * Sets the observable for groups.
-     */
-    public ngOnInit(): void {
-        if (this.data) {
-            this.checkPollState();
-            this.checkPollBackend();
-            this.patchLiveVotingEnabled();
-
-            if (this.data.max_votes_per_option > 1 && !this.pollService.isMaxVotesPerOptionEnabled()) {
-                // Reset max_votes_per_option if a poll has been created with max_votes_per_option>1 but
-                // afterwards this features was disabled. The value will be reset as soon as the options
-                // of this poll are edited.
-                this.data.max_votes_per_option = 1;
-            }
-
-            this.patchFormValues(this.contentForm);
-            this.updateFormControls(this.data);
-            if (this.allowToSetMinMax && !this.data.id) {
-                this.updatePollMethod(PollMethod.Y);
-            } else if (this.allowToSetMinMax) {
-                const controls = this.getVotesAmountControl();
-                this.contentForm
-                    .get(`votes_amount`)
-                    .get(`min_votes_amount`)
-                    .setValidators(controls.get(`min_votes_amount`).validator);
-                this.contentForm
-                    .get(`votes_amount`)
-                    .get(`max_votes_amount`)
-                    .setValidators(controls.get(`max_votes_amount`).validator);
-                this.contentForm
-                    .get(`votes_amount`)
-                    .get(`max_votes_per_option`)
-                    .setValidators(controls.get(`max_votes_per_option`).validator);
-            }
-        }
-
-        this.subscriptions.push(
-            combineLatest([
-                this.contentForm.valueChanges.pipe(startWith(``)),
-                this.pollMethodControl.valueChanges.pipe(startWith(``)),
-                this.pollTypeControl.valueChanges.pipe(startWith(``))
-            ]).subscribe(([contentFormCh]) => {
-                this.updateFormControls(contentFormCh);
-            }),
-            this.pollMethodControl.valueChanges
-                .pipe(distinctUntilChanged())
-                .subscribe(method => this.updatePollMethod(method))
-        );
-
-        // TODO: Fetch groups for repo search selection
-    }
-
-    /**
-     * Updates the whole <poll-form />-component.
-     *
-     * @param update New data to pass into form-fields.
-     */
-    private updateFormControls(update: Partial<ViewPoll>): void {
-        this.updatePollValues(update);
-        this.updateGlobalVoteControls(update);
-        this.updatePercentBases();
-        this.updateLiveVotingEnabled();
-        this.setWarning();
-    }
-
-    private updatePollMethod(method: PollMethod): void {
-        this.contentForm.removeControl(`votes_amount`);
-        if (
-            method === PollMethod.Y ||
-            method === PollMethod.N ||
-            ((method === PollMethod.YNA || method === PollMethod.YN) && this.allowToSetMinMax)
-        ) {
-            this.contentForm.addControl(`votes_amount`, this.getVotesAmountControl());
-        }
-        if (method === PollMethod.N) {
-            this.contentForm.get(`votes_amount`).get(`max_votes_per_option`).setValue(1);
-        }
-    }
-
-    /**
-     * Generic recursive helper function to patch the form
-     * will transitive move poll.min_votes_amount and poll.max_votes_amount into
-     * form.votes_amount.min_votes_amount/max_votes_amount
-     * @param formGroup
-     */
-    private patchFormValues(formGroup: UntypedFormGroup): void {
-        for (const key of Object.keys(formGroup.controls)) {
-            const currentControl = formGroup.controls[key];
-            if (currentControl instanceof UntypedFormControl) {
-                if (this.data[key]) {
-                    currentControl.patchValue(this.data[key]);
-                }
-            } else if (currentControl instanceof UntypedFormGroup) {
-                this.patchFormValues(currentControl);
-            }
-        }
-    }
-
-    private checkPollBackend(): void {
-        const pollType = this.data.content_object?.collection as PollClassType;
-        if (!this.data.backend) {
-            if (pollType !== PollClassType.Topic) {
-                this.data.backend = this.meetingSettingsService.instant(`${pollType}_poll_default_backend`);
-            } else {
-                this.data.backend = this.meetingSettingsService.instant(`poll_default_backend`);
-            }
-        }
-    }
-
-    private patchLiveVotingEnabled(): void {
-        if (this.isMotionPoll || this.isAssignmentPoll) {
-            const liveVotingDefault = this.meetingSettingsService.instant(`poll_default_live_voting_enabled`) ?? false;
-            this.liveVotingControl.setValue(liveVotingDefault);
-        }
-    }
-
-    private checkPollState(): void {
-        if (this.data.state) {
-            this.disablePollType();
-        }
-    }
-
-    private disablePollType(): void {
-        this.pollTypeControl.disable();
-    }
-
-    public showMinMaxVotes(data: any): boolean {
-        const selectedPollMethod: FormPollMethod = this.pollMethodControl.value;
-        return (
-            (selectedPollMethod === FormPollMethod.Y ||
-                (selectedPollMethod !== FormPollMethod.LIST_YNA && this.allowToSetMinMax)) &&
-            (!data || !data.state || data.isCreated)
-        );
-    }
-
-    public showMaxVotesPerOption(data: any): boolean {
-        const selectedPollMethod: FormPollMethod = this.pollMethodControl.value;
-        return selectedPollMethod === FormPollMethod.Y && (!data || !data.state || data.isCreated);
-    }
-
-    /**
-     * updates the available percent bases according to the pollmethod
-     * @param method the currently chosen pollmethod
-     */
-    private updatePercentBases(): void {
-        const method = this.pollMethodControl.value.toUpperCase();
-        const type = this.pollTypeControl.value;
-        if (!method && !type) {
-            return;
-        }
-
-        let forbiddenBases = [];
-        if (method === PollMethod.YN) {
-            forbiddenBases = [PollPercentBase.YNA, PollPercentBase.Y];
-        } else if (method === PollMethod.YNA) {
-            forbiddenBases = [PollPercentBase.Y];
-        } else if (method === PollMethod.Y || PollMethod.N) {
-            forbiddenBases = [PollPercentBase.YN, PollPercentBase.YNA];
-        }
-
-        if (type === PollType.Analog) {
-            forbiddenBases.push(PollPercentBase.Entitled, PollPercentBase.EntitledPresent);
-        }
-
-        const bases = {};
-        for (const [key, value] of Object.entries(this.percentBases)) {
-            if (!forbiddenBases.includes(key)) {
-                bases[key] = value;
-            }
-        }
-
-        // update value in case that its no longer valid
-        this.percentBaseControl.setValue(this.getNormedPercentBase(this.percentBaseControl.value, method, type), {
-            emitEvent: false
-        });
-
-        this.validPercentBases = bases;
-    }
-
-    private updateLiveVotingEnabled(): void {
-        if (!this.isLiveVotingAvailable) {
-            this.liveVotingControl.setValue(false, {
-                emitEvent: false
-            });
-        }
-    }
-
-    private getNormedPercentBase(base: PollPercentBase, method: PollMethod, type: PollType): PollPercentBase {
-        if (method === PollMethod.YN && (base === PollPercentBase.YNA || base === PollPercentBase.Y)) {
-            return PollPercentBase.YN;
-        } else if (method === PollMethod.YNA && base === PollPercentBase.Y) {
-            return PollPercentBase.YNA;
-        } else if (method === PollMethod.Y && (base === PollPercentBase.YN || base === PollPercentBase.YNA)) {
-            return PollPercentBase.Y;
-        } else if (
-            type === PollType.Analog &&
-            (base === PollPercentBase.Entitled || base === PollPercentBase.EntitledPresent)
-        ) {
-            return PollPercentBase.Cast;
-        }
-        return base;
-    }
-
-    /**
-     * Disable votes_amount form control if the poll type is anonymous
-     * and the poll method is votes.
-     */
-    private setWarning(): void {
-        if (this.pollTypeControl.value === PollType.Pseudoanonymous) {
-            this.showNonNominalWarning = true;
-        } else {
-            this.showNonNominalWarning = false;
-        }
-    }
-
-    public getValues(): Partial<{ [place in keyof ViewPoll]: any }> {
-        return { ...this.data, ...this.serializeForm(this.contentForm) };
-    }
-
-    private serializeForm(formGroup: UntypedFormGroup): Partial<ViewPoll> {
-        /**
-         * getRawValue() includes disabled controls.
-         * Required since the server assumes missing fields would imply "true"
-         */
-        const formData = { ...formGroup.getRawValue(), ...formGroup.value.votes_amount };
-        delete formData.votes_amount;
-        return formData;
-    }
-
-    /**
-     * This updates the poll-values to get correct data in the view.
-     *
-     * @param data Passing the properties of the poll.
-     */
-    protected updatePollValues(data: Record<string, any>, additionalPollValues?: PollPropertyVerboseKey[]): void {
-        if (this.data) {
-            const pollMethod: FormPollMethod = data[`pollmethod`];
-            const pollType: PollType = data[`type`];
-            this.pollValues = [
-                [
-                    this.pollService.getVerboseNameForKey(`type`),
-                    this.pollService.getVerboseNameForValue(`type`, data[`type`])
-                ]
-            ];
-            // optional pollValues
-            if (additionalPollValues) {
-                additionalPollValues.forEach(value => {
-                    this.pollValues.push([
-                        this.pollService.getVerboseNameForKey(value),
-                        this.pollService.getVerboseNameForValue(value, data[value])
-                    ]);
-                });
-            }
-            if (pollType !== PollType.Analog) {
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`groups`),
-                    data && data[`entitled_group_ids`] && data[`entitled_group_ids`].length
-                        ? this.groupRepo.getNameForIds(...data[`entitled_group_ids`])
-                        : `---`
-                ]);
-            }
-
-            if (pollMethod === FormPollMethod.Y || pollMethod === FormPollMethod.N) {
-                this.pollValues.push([this.pollService.getVerboseNameForKey(`global_yes`), data[`global_yes`]]);
-                this.pollValues.push([this.pollService.getVerboseNameForKey(`global_no`), data[`global_no`]]);
-                this.pollValues.push([this.pollService.getVerboseNameForKey(`global_abstain`), data[`global_abstain`]]);
-                this.pollValues.push([this.pollService.getVerboseNameForKey(`votes_amount`), data[`votes_amount`]]);
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`max_votes_amount`),
-                    data[`max_votes_amount`]
-                ]);
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`min_votes_amount`),
-                    data[`min_votes_amount`]
-                ]);
-            }
-
-            if ((pollMethod === FormPollMethod.YNA || pollMethod === FormPollMethod.YN) && this.allowToSetMinMax) {
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`max_votes_amount`),
-                    data[`max_votes_amount`]
-                ]);
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`min_votes_amount`),
-                    data[`min_votes_amount`]
-                ]);
-            }
-
-            if (pollMethod === FormPollMethod.Y || pollMethod === FormPollMethod.N) {
-                this.pollValues.push([
-                    this.pollService.getVerboseNameForKey(`max_votes_per_option`),
-                    data[`max_votes_per_option`]
-                ]);
-            }
-        }
-    }
-
-    private enoughPollOptionsAvailable(minCtrlName: string, perOptionCtrlNam: string): ValidatorFn {
-        return (formControl: AbstractControl): Record<string, any> | null => {
-            if (
-                this.meetingSettingsService.instant(`assignment_poll_enable_max_votes_per_option`) ||
-                !this.pollOptionAmount ||
-                this.isList
-            ) {
-                return null;
-            }
-            const min = formControl.get(minCtrlName)!.value;
-            const votesPerOption = formControl.get(perOptionCtrlNam)!.value || 1;
-            if (this.pollOptionAmount * votesPerOption < min) {
-                return { notEnoughOptionsError: true };
-            }
-
-            return null;
-        };
-    }
-
-    private initContentForm(): void {
-        this.contentForm = this.fb.group({
-            title: [``, Validators.required],
-            type: [``, Validators.required],
-            pollmethod: [``, Validators.required],
-            onehundred_percent_base: [``, Validators.required],
-            votes_amount: this.getVotesAmountControl(),
-            entitled_group_ids: [],
-            backend: [],
-            global_yes: [false],
-            global_no: [false],
-            global_abstain: [false],
-            live_voting_enabled: [false]
-        });
-    }
-
-    private getVotesAmountControl(): UntypedFormGroup {
-        const maxVotesPreselect =
-            (this.isPollMethodYNA || this.isPollMethodYN) && this.allowToSetMinMax ? this.pollOptionAmount : 1;
-        const config = {
-            max_votes_amount: [maxVotesPreselect, [Validators.required, Validators.min(1)]],
-            min_votes_amount: [1, [Validators.required, Validators.min(1)]],
-            max_votes_per_option: [1, [Validators.required, Validators.min(1)]]
-        };
-        if (this.allowToSetMinMax) {
-            if (this.meetingSettingsService.instant(`assignment_poll_enable_max_votes_per_option`)) {
-                config.max_votes_amount = [maxVotesPreselect, [Validators.required, Validators.min(1)]];
-            } else {
-                config.max_votes_amount = [
-                    maxVotesPreselect,
-                    [Validators.required, Validators.min(1), Validators.max(this.pollOptionAmount)]
-                ];
-            }
-        }
-        return this.fb.group(config, {
-            validators: [
-                isNumberRange(`min_votes_amount`, `max_votes_amount`),
-                this.enoughPollOptionsAvailable(`min_votes_amount`, `max_votes_per_option`),
-                isNumberRange(`max_votes_per_option`, `max_votes_amount`, `rangeErrorMaxPerOption`)
-            ]
-        });
-    }
-
-    private enableGlobalVoteControls(): void {
-        const suppressEvent = {
-            emitEvent: false
-        };
-        this.globalYesControl.enable(suppressEvent);
-        this.globalNoControl.enable(suppressEvent);
-        this.globalAbstainControl.enable(suppressEvent);
-    }
-
-    /**
-     * Function for disabling and emptying the global option form constrols.
-     *
-     * The controls that should be disabled can be specified via the parameters.
-     * If no target controls are specified all three global options will be disabled.
-     */
-    private disableGlobalVoteControls(...toDisable: (`Yes` | `No` | `Abstain`)[]): void {
-        const suppressEvent = {
-            emitEvent: false
-        };
-        toDisable = toDisable.length ? toDisable : [`Yes`, `No`, `Abstain`];
-        toDisable.forEach(name => {
-            const control = this[`global${name}Control`];
-            control.disable(suppressEvent);
-            control.setValue(false, suppressEvent);
-        });
-    }
-
-    private updateGlobalVoteControls(data: Partial<ViewPoll>): void {
-        const pollMethod = data.pollmethod;
-        if (pollMethod) {
-            if (this.isList) {
-                this.disableGlobalVoteControls();
-                return;
-            }
-            this.enableGlobalVoteControls();
-            if (pollMethod.includes(FormPollMethod.Y)) {
-                this.disableGlobalVoteControls(`Yes`);
-            }
-            if (pollMethod.includes(FormPollMethod.N)) {
-                this.disableGlobalVoteControls(`No`);
-            }
-            if (pollMethod.includes(FormPollMethod.YNA)) {
-                this.disableGlobalVoteControls(`Abstain`);
-            }
-        }
-    }
-
-    public openVotingWarning(event: MouseEvent): void {
-        event.stopPropagation();
-        this.dialog.open();
-    }
-
-    /**
-     * compare function used with the KeyValuePipe to display the percent bases in original order
-     */
-    public keepEntryOrder(): number {
-        return 0;
-    }
-
-    public getErrorMessage(message: string): string {
-        switch (message) {
-            case `notEnoughOptionsError`:
-                return this.translate.instant(`There are not enough options.`);
-            case `rangeError`:
-                return this.translate.instant(`Min votes cannot be greater than max votes.`);
-            case `rangeErrorMaxPerOption`:
-                return this.translate.instant(`Max votes per option cannot be greater than max votes.`);
-            case `max`:
-                return this.translate.instant(`Max votes cannot be greater than options.`);
-            default:
-                return ``;
-        }
-    }
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html
deleted file mode 100644
index 7631b5c9ff..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html
+++ /dev/null
@@ -1,397 +0,0 @@
-@if (poll && isReady) {
-    <!-- own voting -->
-    @if (!isUserInMeeting) {
-        <div class="text-center">
-            {{ 'You are not part of the meeting' | translate }}
-        </div>
-    } @else if (isUserPresent) {
-        <ng-container [ngTemplateOutlet]="votingArea" />
-    } @else {
-        <div class="text-center">
-            {{ 'You have to be present to vote.' | translate }}
-        </div>
-    }
-    <!-- Delegations -->
-    @if (isUserPresent && (voteDelegationEnabled | async)) {
-        @for (delegation of delegations; track delegation.id) {
-            <div class="poll-vote-delegation">
-                <mat-divider></mat-divider>
-                <ng-container
-                    [ngTemplateOutlet]="votingArea"
-                    [ngTemplateOutletContext]="{ delegation: delegation }"
-                ></ng-container>
-            </div>
-        }
-    }
-}
-
-<ng-template #votingArea let-delegation="delegation">
-    @if (delegation) {
-        <h4 class="poll-delegation-title">
-            <span>{{ 'Voting right for' | translate }}</span>
-            <span>&nbsp;{{ delegation.getFullName() }}</span>
-        </h4>
-    }
-    @if ({ canVote: canVoteForObservable(delegation) | async }; as voting) {
-        @if (voting.canVote && !(hasAlreadyVoted(delegation) || isDeliveringVote(delegation))) {
-            <!-- Poll hint -->
-            @if (pollHint) {
-                <p>
-                    <i>{{ pollHint }}</i>
-                </p>
-            }
-            <div>
-                @if (poll.type !== PollType.Analog) {
-                    <div role="grid">
-                        <!-- Leftover votes -->
-                        @if (showAvailableVotes && !settings.hideLeftoverVotes) {
-                            <div class="option-list-information-grid" role="row">
-                                <b>{{ poll.option_ids.length }} {{ optionPluralLabel | translate }}</b>
-                                <div></div>
-                                <b class="text-right">
-                                    {{ 'Available votes' | translate }}:
-                                    <b>{{ getVotesAvailable(delegation) }}/{{ poll.max_votes_amount }}</b>
-                                    @if (poll.min_votes_amount > 1) {
-                                        <span>
-                                            <br />
-                                            {{ 'At least' | translate }}
-                                            <b>{{ poll.min_votes_amount }}</b>
-                                            {{ 'Votes' | translate }}
-                                        </span>
-                                    }
-                                    @if (poll.max_votes_per_option > 1) {
-                                        <span>
-                                            <br />
-                                            {{ 'At most' | translate }}
-                                            <b>{{ poll.max_votes_per_option }}</b>
-                                            {{ maxVotesPerOptionSuffix | translate }}
-                                        </span>
-                                    }
-                                </b>
-                            </div>
-                        }
-                        <!-- Options and Actions -->
-                        @if (!(settings.isSplitSingleOption && !displayed_in_autopilot)) {
-                            <div
-                                role="row"
-                                [ngClass]="{
-                                    'yna-grid':
-                                        ((poll.isListPoll && !isMobile) || !poll.isListPoll) &&
-                                        (poll.isMethodYNA ||
-                                            (settings.isSplitSingleOption &&
-                                                displayed_in_autopilot &&
-                                                poll.isMethodYNA)),
-                                    'yna-grid-extended':
-                                        poll.isMethodYNA &&
-                                        isMobile &&
-                                        !settings.isSplitSingleOption &&
-                                        poll.isListPoll,
-                                    'remove-grid-gap': settings.isSplitSingleOption && displayed_in_autopilot,
-                                    'yn-grid':
-                                        poll.isMethodYN ||
-                                        (settings.isSplitSingleOption && displayed_in_autopilot && poll.isMethodYN),
-                                    'single-vote-grid':
-                                        (poll.isMethodY || poll.isMethodN) && poll.max_votes_per_option <= 1,
-                                    'single-multi-vote-grid':
-                                        (poll.isMethodY || poll.isMethodN) && poll.max_votes_per_option > 1
-                                }"
-                            >
-                                @if (showAvailableVotes) {
-                                    <div class="grid-name-area" role="gridcell"></div>
-                                }
-                                @if (
-                                    !showAvailableVotes &&
-                                    poll.option_ids &&
-                                    !(settings.isSplitSingleOption && displayed_in_autopilot)
-                                ) {
-                                    <b class="grid-name-area" role="gridcell">
-                                        @if (poll.isListPoll) {
-                                            {{ poll.options[0]?.contentTitlesAsSortedArray.length }}
-                                        } @else {
-                                            {{ poll.option_ids.length }}
-                                        }
-                                        {{ optionPluralLabel | translate }}
-                                    </b>
-                                }
-                                @if (!settings.isSplitSingleOption && poll.isListPoll && isMobile) {
-                                    @if (poll.options[0]?.content_object) {
-                                        <div class="vote-option-title-single" role="gridcell">
-                                            <span>
-                                                <span>{{ poll.options[0].content_object.getTitle() | translate }}</span>
-                                            </span>
-                                        </div>
-                                    }
-                                }
-                                @for (
-                                    action of voteActions.length ? voteActions : voteOptions;
-                                    track action.vote;
-                                    let i = $index
-                                ) {
-                                    @if (!poll.isTopicPoll) {
-                                        <b class="poll-option-title" role="columnheader" [ngClass]="'option' + i">
-                                            {{ action.label | translate }}
-                                        </b>
-                                    }
-                                }
-                            </div>
-                        }
-                        @if (poll.isMethodN && poll.hasGlobalOptionEnabled && poll.global_yes) {
-                            @if (!settings.hideGlobalOptions) {
-                                @for (option of globalVoteActions; track option.vote) {
-                                    @if (option.vote === 'Y') {
-                                        <div class="single-vote-grid" role="row">
-                                            <div class="vote-option-title" role="rowheader">
-                                                <span>
-                                                    {{ getGlobalOptionName(option) | translate }}
-                                                </span>
-                                            </div>
-                                            <div class="vote-button-area" role="gridcell">
-                                                <button
-                                                    class="vote-button"
-                                                    mat-raised-button
-                                                    [disabled]="isDeliveringVote(delegation)"
-                                                    (click)="saveGlobalVote(option.vote, delegation)"
-                                                >
-                                                    <div
-                                                        class="vote-button-content"
-                                                        [ngClass]="getGlobalButtonContentClass(option, delegation)"
-                                                    >
-                                                        <os-custom-icon
-                                                            class="vote-button-cross"
-                                                            [customIcon]="drawnCross"
-                                                            [ngClass]="getGlobalCSSClass(option, delegation)"
-                                                        ></os-custom-icon>
-                                                        <mat-icon class="vote-button-circle">
-                                                            radio_button_unchecked
-                                                        </mat-icon>
-                                                    </div>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    }
-                                }
-                            }
-                            @if (!settings.hideLeftoverVotes) {
-                                <div class="or-divider-grid" role="row">
-                                    <div class="hr-wrapper">
-                                        <hr />
-                                    </div>
-                                    <div translate>OR</div>
-                                    <div class="hr-wrapper">
-                                        <hr />
-                                    </div>
-                                </div>
-                            }
-                        }
-
-                        @for (option of poll.options; track option.id; let i = $index) {
-                            <div
-                                [attr.role]="poll.max_votes_per_option > 1 ? 'row' : 'row radiogroup'"
-                                [ngClass]="{
-                                    'yna-split-grid':
-                                        settings.isSplitSingleOption && !displayed_in_autopilot && poll.isMethodYNA,
-                                    'yn-split-grid':
-                                        settings.isSplitSingleOption && !displayed_in_autopilot && poll.isMethodYN,
-                                    'remove-grid-gap': settings.isSplitSingleOption && displayed_in_autopilot,
-                                    'yna-grid':
-                                        (!settings.isSplitSingleOption && poll.isMethodYNA) ||
-                                        (settings.isSplitSingleOption && displayed_in_autopilot && poll.isMethodYNA),
-                                    'yn-grid':
-                                        (!settings.isSplitSingleOption && poll.isMethodYN) ||
-                                        (settings.isSplitSingleOption && displayed_in_autopilot && poll.isMethodYN),
-                                    'single-vote-grid':
-                                        !settings.isSplitSingleOption &&
-                                        (poll.isMethodY || poll.isMethodN) &&
-                                        poll.max_votes_per_option <= 1,
-                                    'single-multi-vote-grid':
-                                        !settings.isSplitSingleOption &&
-                                        (poll.isMethodY || poll.isMethodN) &&
-                                        poll.max_votes_per_option > 1,
-                                    'accentuated-background': i % 2 === 1
-                                }"
-                            >
-                                @if (!settings.isSplitSingleOption && !option.isListOption) {
-                                    <div
-                                        class="vote-option-title grid-name-area"
-                                        role="rowheader"
-                                        [ngClass]="{ 'strike-text no': shouldStrikeOptionText(option, delegation) }"
-                                    >
-                                        @if (option.content_object) {
-                                            <span>
-                                                <span>{{ option.content_object.short_name }}</span>
-                                                @if (option.content_object.getLevelAndNumber()) {
-                                                    <div class="user-subtitle">
-                                                        {{ option.content_object.getLevelAndNumber() }}
-                                                    </div>
-                                                }
-                                            </span>
-                                        }
-                                        @if (option.text) {
-                                            <span>
-                                                <span>{{ option.text }}</span>
-                                            </span>
-                                        }
-                                        @if (!option.content_object && !option.text) {
-                                            <i>{{ noDataLabel | translate }}</i>
-                                        }
-                                    </div>
-                                }
-                                @if (!settings.isSplitSingleOption && option.isListOption && !isMobile) {
-                                    <div class="vote-option-title grid-name-area" role="rowheader">
-                                        @if (option.content_object) {
-                                            <span>
-                                                <span>{{ option.content_object.getTitle() | translate }}</span>
-                                            </span>
-                                        }
-                                    </div>
-                                }
-                                @if (!poll.max_votes_per_option || poll.max_votes_per_option <= 1) {
-                                    @for (
-                                        action of voteActions.length ? voteActions : voteOptions;
-                                        track action.vote;
-                                        let i = $index
-                                    ) {
-                                        <div class="vote-button-area" role="gridcell" [ngClass]="'option' + i">
-                                            <button
-                                                class="vote-button"
-                                                mat-raised-button
-                                                role="radio"
-                                                [ariaLabel]="action.label | translate"
-                                                [attr.aria-checked]="
-                                                    getActionButtonClass(action, option, delegation) ? 'true' : 'false'
-                                                "
-                                                [disabled]="isDeliveringVote(delegation)"
-                                                (click)="saveSingleVote(option.id, action.vote, delegation)"
-                                            >
-                                                <div
-                                                    class="vote-button-content"
-                                                    [ngClass]="getActionButtonContentClass(action, option, delegation)"
-                                                >
-                                                    <os-custom-icon
-                                                        class="vote-button-cross"
-                                                        [customIcon]="drawnCross"
-                                                        [ngClass]="getActionButtonClass(action, option, delegation)"
-                                                    ></os-custom-icon>
-                                                    <mat-icon class="vote-button-circle">
-                                                        radio_button_unchecked
-                                                    </mat-icon>
-                                                </div>
-                                            </button>
-                                            @if (settings.isSplitSingleOption && !displayed_in_autopilot) {
-                                                <span aria-hidden="true" class="vote-label">
-                                                    {{ action.label | translate }}
-                                                </span>
-                                            }
-                                        </div>
-                                    }
-                                }
-                                @if (poll.max_votes_per_option > 1) {
-                                    <mat-form-field appearance="outline" class="vote-input" role="gridcell">
-                                        <input
-                                            matInput
-                                            max="{{ poll.max_votes_per_option }}"
-                                            min="0"
-                                            required
-                                            type="number"
-                                            value="0"
-                                            [formControl]="getFormControl(option.id)"
-                                            (change)="saveMultipleVotes(option.id, $event, delegation)"
-                                        />
-                                        <mat-error>
-                                            {{ getErrorInVoteEntry(option.id) }}
-                                        </mat-error>
-                                    </mat-form-field>
-                                }
-                            </div>
-                        }
-                        @if (
-                            (poll.isMethodY || poll.isMethodN || poll.isMethodYN) &&
-                            poll.hasGlobalOptionEnabled &&
-                            (!poll.isMethodN || poll.global_no || poll.global_abstain)
-                        ) {
-                            @if (!settings.hideLeftoverVotes) {
-                                <div class="or-divider-grid" role="row">
-                                    <div class="hr-wrapper">
-                                        <hr />
-                                    </div>
-                                    <div translate>OR</div>
-                                    <div class="hr-wrapper">
-                                        <hr />
-                                    </div>
-                                </div>
-                            }
-
-                            <!-- global yes/no/abstain -->
-                            @if (!settings.hideGlobalOptions) {
-                                @for (option of globalVoteActions; track option.vote) {
-                                    @if (!poll.isMethodN || option.vote !== 'Y') {
-                                        <div class="single-vote-grid" role="row">
-                                            <div class="vote-option-title" role="rowheader">
-                                                <span>
-                                                    {{ getGlobalOptionName(option) | translate }}
-                                                </span>
-                                            </div>
-                                            <div class="vote-button-area" role="gridcell">
-                                                <button
-                                                    class="vote-button"
-                                                    mat-raised-button
-                                                    role="checkbox"
-                                                    [attr.aria-checked]="
-                                                        getGlobalCSSClass(option, delegation) ? 'true' : 'false'
-                                                    "
-                                                    [disabled]="isDeliveringVote(delegation)"
-                                                    (click)="saveGlobalVote(option.vote, delegation)"
-                                                >
-                                                    <div
-                                                        class="vote-button-content"
-                                                        [ngClass]="getGlobalButtonContentClass(option, delegation)"
-                                                    >
-                                                        <os-custom-icon
-                                                            class="vote-button-cross"
-                                                            [customIcon]="drawnCross"
-                                                            [ngClass]="getGlobalCSSClass(option, delegation)"
-                                                        ></os-custom-icon>
-                                                        <mat-icon class="vote-button-circle">
-                                                            radio_button_unchecked
-                                                        </mat-icon>
-                                                    </div>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    }
-                                }
-                            }
-                        }
-                    </div>
-                }
-            </div>
-            <!-- Submit Vote -->
-            @if (!settings.hideSendNow) {
-                <ng-container [ngTemplateOutlet]="sendNow" [ngTemplateOutletContext]="{ delegation: delegation }" />
-            }
-        }
-        <os-poll-cannot-vote-message
-            [delegationUser]="delegation"
-            [hasAlreadyVoted]="hasAlreadyVoted(delegation)"
-            [hasDelegations]="!delegations.length"
-            [isDeliveringVote]="isDeliveringVote(delegation)"
-            [poll]="poll"
-        />
-    }
-</ng-template>
-
-<ng-template #sendNow let-delegation="delegation">
-    <div class="centered-button-wrapper">
-        <button
-            color="accent"
-            mat-flat-button
-            [disabled]="getVotesCount(delegation) < minVotes"
-            (click)="submitVote(delegation)"
-        >
-            <mat-icon>how_to_vote</mat-icon>
-            <span>
-                {{ 'Submit vote now' | translate }}
-            </span>
-        </button>
-    </div>
-</ng-template>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.scss
deleted file mode 100644
index 29ea1d52f3..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.scss
+++ /dev/null
@@ -1,271 +0,0 @@
-@use 'src/assets/styles/poll-colors.scss';
-@use 'src/assets/styles/poll-styles-common.scss';
-
-%vote-grid-base {
-    display: grid;
-    grid-gap: 10px;
-    padding: 10px;
-    margin: 0 10px;
-
-    .vote-button {
-        min-width: 50px;
-        height: 50px;
-        margin: auto;
-
-        .vote-button-content {
-            margin: auto;
-            display: grid;
-
-            .vote-button-circle,
-            .vote-button-cross {
-                grid-column: 1;
-                grid-row: 1;
-            }
-
-            .vote-button-circle {
-                z-index: 0;
-            }
-
-            .vote-button-cross {
-                z-index: 1;
-                height: 24px;
-                width: 24px;
-                opacity: 0;
-            }
-        }
-
-        .button-content-opaque {
-            opacity: 0.5;
-        }
-
-        .button-content-not-opaque {
-            opacity: 1 !important;
-        }
-    }
-
-    .vote-button-area {
-        display: inline-grid;
-        justify-content: center;
-    }
-
-    .vote-button:hover {
-        .button-content-opaque {
-            opacity: 1;
-        }
-    }
-
-    .vote-label {
-        margin-left: 10px;
-    }
-
-    .poll-option-title {
-        text-align: center;
-    }
-}
-
-.or-divider-grid {
-    @extend %vote-grid-base;
-    grid-template-areas: 'left or right';
-    grid-template-columns: auto min-content auto;
-
-    .hr-wrapper {
-        height: 100%;
-    }
-}
-
-.poll-vote-delegation {
-    margin-top: 1em;
-
-    .poll-delegation-title {
-        font-weight: 500;
-    }
-}
-
-.yn-grid {
-    @extend %vote-grid-base;
-    grid-template-areas: 'name yes no';
-    grid-template-columns: auto var(--poll-option-title-width, 70px) var(--poll-option-title-width, 70px);
-    @media (max-width: 700px) {
-        grid-template-areas: 'name name name' '. yes no';
-    }
-}
-
-.yna-grid {
-    @extend %vote-grid-base;
-    grid-template-areas: 'name yes no abstain';
-    grid-template-columns: auto var(--poll-option-title-width, 70px) var(--poll-option-title-width, 70px) var(
-            --poll-option-title-width,
-            70px
-        );
-    @media (max-width: 700px) {
-        grid-template-areas: 'name name name name' '. yes no abstain';
-    }
-}
-
-.yna-grid-extended {
-    @extend %vote-grid-base;
-    grid-template-areas: 'name name name name' 'subtitle subtitle subtitle subtitle' '. yes no abstain';
-    grid-template-columns: auto var(--poll-option-title-width, 70px) var(--poll-option-title-width, 70px) var(
-            --poll-option-title-width,
-            70px
-        );
-}
-
-.remove-grid-gap {
-    @media (max-width: 700px) {
-        //grid-gap: 0 !important;
-        grid-template-areas: 'yes no abstain';
-        grid-template-columns: 70px 70px 70px;
-        justify-content: end;
-    }
-}
-
-.single-vote-grid {
-    @extend %vote-grid-base;
-    grid-template-areas: 'name yes';
-    grid-template-columns: auto var(--poll-option-title-width, 70px);
-    @media (max-width: 700px) {
-        grid-template-areas: 'name name' '. yes';
-    }
-}
-
-.single-multi-vote-grid {
-    @extend %vote-grid-base;
-    grid-template-areas: 'name yes';
-    grid-template-columns: auto 120px;
-    @media (max-width: 700px) {
-        grid-template-areas: 'name name' '. yes';
-    }
-}
-
-.yna-split-grid {
-    margin: 0;
-    padding: 10px 0;
-    @extend %vote-grid-base;
-    grid-template-areas: 'yes no abstain';
-    grid-template-columns: auto-fit auto-fit auto-fit;
-    @media (max-width: 296px) or ((max-width: 1164px) and (min-width: 959.1px)) {
-        grid-template-areas: 'yes' 'no' 'abstain';
-        grid-template-columns: auto-fit;
-    }
-    @media ((max-width: 416px) and (min-width: 296.1px)) or ((max-width: 1564px) and (min-width: 1164.1px)) {
-        grid-template-areas: 'yes no' 'abstain .';
-        grid-template-columns: auto-fit auto-fit;
-    }
-    @media ((max-width: 959px) and (min-width: 416.1px)) {
-        grid-template-areas: 'yes no abstain';
-        grid-template-columns: auto-fit auto-fit auto-fit;
-    }
-    .vote-label {
-        padding-top: 5px;
-        margin: 0;
-        text-align: center;
-    }
-}
-
-.yn-split-grid {
-    margin: 0;
-    padding: 10px 0;
-    @extend %vote-grid-base;
-    grid-template-areas: 'yes no';
-    grid-template-columns: auto-fit auto-fit;
-    @media (max-width: 296px) or ((max-width: 1164px) and (min-width: 959.1px)) {
-        grid-template-areas: 'yes' 'no';
-        grid-template-columns: auto-fit;
-    }
-    @media ((max-width: 416px) and (min-width: 296.1px)) or (min-width: 1164.1px) {
-        grid-template-areas: 'yes no';
-        grid-template-columns: auto-fit auto-fit;
-    }
-    .vote-label {
-        padding-top: 5px;
-        margin: 0;
-        text-align: center;
-    }
-}
-
-.global-option-grid {
-    @extend %vote-grid-base;
-    grid-template-columns: auto var(--poll-option-title-width, 70px);
-}
-
-.option-list-information-grid {
-    @extend %vote-grid-base;
-    grid-template-columns: max-content auto max-content;
-}
-
-.grid-name-area {
-    grid-area: name;
-}
-
-.vote-option-title {
-    display: flex;
-    span,
-    i {
-        margin-top: auto;
-        margin-bottom: auto;
-    }
-}
-
-.vote-option-title-single {
-    display: flex;
-    span,
-    i {
-        margin-top: auto;
-        margin-bottom: auto;
-    }
-    grid-area: subtitle;
-}
-
-.option0 {
-    grid-area: yes;
-}
-
-.option1 {
-    grid-area: no;
-}
-
-.option2 {
-    grid-area: abstain;
-}
-
-.strike-text {
-    text-decoration: line-through;
-}
-
-.centered-button-wrapper {
-    display: flex;
-    text-align: center;
-    margin-top: 20px;
-    > * {
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    .vote-submitted {
-        color: poll-colors.$votes-yes-color;
-        font-size: 200%;
-        overflow: visible;
-    }
-}
-
-.vote-input {
-    width: 120px;
-}
-
-.mat-divider-horizontal {
-    position: initial;
-}
-
-.submit-vote-indicator {
-    text-align: center;
-    .mat-mdc-progress-spinner {
-        display: block;
-        margin: auto;
-        margin-left: 100px;
-    }
-}
-
-.text-right {
-    text-align: right;
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts
deleted file mode 100644
index a4241c3f3e..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts
+++ /dev/null
@@ -1,542 +0,0 @@
-import { ChangeDetectorRef, Directive, inject, Input, OnInit } from '@angular/core';
-import { UntypedFormControl, Validators } from '@angular/forms';
-import { _ } from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, debounceTime, distinctUntilChanged, Observable, Subscription } from 'rxjs';
-import { Id } from 'src/app/domain/definitions/key-types';
-import {
-    GlobalVote,
-    IdentifiedVotingData,
-    PollContentObject,
-    PollPropertyVerbose,
-    PollType,
-    VoteValue,
-    VotingData
-} from 'src/app/domain/models/poll';
-import { BaseComponent } from 'src/app/site/base/base.component';
-import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service';
-import { ViewOption, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-import { OperatorService } from 'src/app/site/services/operator.service';
-import { ViewPortService } from 'src/app/site/services/view-port.service';
-import { CustomIcon } from 'src/app/ui/modules/custom-icon/definitions';
-
-import { MeetingSettingsService } from '../../../../services/meeting-settings.service';
-import { VoteControllerService } from '../../services/vote-controller.service';
-import { VotingProhibition, VotingService } from '../../services/voting.service';
-
-export interface VoteOption {
-    vote?: VoteValue;
-    css?: string;
-    label: string;
-}
-
-export interface PollVoteViewSettings {
-    hideLeftoverVotes?: boolean;
-    hideGlobalOptions?: boolean;
-    hideSendNow?: boolean;
-    isSplitSingleOption?: boolean;
-}
-
-@Directive()
-export abstract class BasePollVoteComponent<C extends PollContentObject = any> extends BaseComponent implements OnInit {
-    public readonly drawnCross = CustomIcon.DRAWN_CROSS;
-
-    @Input()
-    public set poll(value: ViewPoll<C>) {
-        this._poll = value;
-        this.updatePoll();
-    }
-
-    public get poll(): ViewPoll<C> {
-        return this._poll;
-    }
-
-    @Input()
-    public set displayInAutopilot(is_in_autopilot: boolean) {
-        this.displayed_in_autopilot = is_in_autopilot;
-    }
-
-    protected displayed_in_autopilot = true;
-
-    public PollType = PollType;
-    public formControlMap: Record<number, UntypedFormControl> = {};
-
-    public get minVotes(): number {
-        return this.poll.min_votes_amount;
-    }
-
-    public votingErrors = VotingProhibition;
-
-    public get isReady(): boolean {
-        return this._isReady;
-    }
-
-    public get isUserPresent(): boolean {
-        return this.user?.isPresentInMeeting();
-    }
-
-    public get isUserInMeeting(): boolean {
-        return this.user?.isInActiveMeeting;
-    }
-
-    public get isMobile(): boolean {
-        return this.viewport.isMobile;
-    }
-
-    public PollPropertyVerbose = PollPropertyVerbose;
-
-    public delegations: ViewUser[] = [];
-
-    public readonly voteOptions: VoteOption[] = [
-        {
-            vote: `Y`,
-            css: `voted-yes`,
-            label: `Yes`
-        },
-        {
-            vote: `N`,
-            css: `voted-no`,
-            label: `No`
-        },
-        {
-            vote: `A`,
-            css: `voted-abstain`,
-            label: `Abstain`
-        }
-    ];
-
-    /**
-     * Subset of voteOptions that is used based on the pollmethod.
-     */
-    public voteActions: VoteOption[] = [];
-
-    public get showAvailableVotes(): boolean {
-        return !this.poll.isListPoll && this.poll.max_votes_amount > 1;
-    }
-
-    /**
-     * Subset of global voteOptions that is used.
-     */
-    public globalVoteActions: VoteOption[] = [];
-
-    // eslint-disable-next-line @typescript-eslint/class-literal-property-style
-    public get pollHint(): string {
-        return null;
-    }
-
-    public readonly settings: PollVoteViewSettings = {};
-
-    public readonly noDataLabel: string = _(`No data`);
-
-    public readonly maxVotesPerOptionSuffix: string = _(`votes per option`);
-
-    public readonly optionPluralLabel: string = _(`Options`);
-
-    public voteDelegationEnabled: Observable<boolean> =
-        this.meetingSettingsService.get(`users_enable_vote_delegations`);
-
-    public forbidDelegationToVote: Observable<boolean> =
-        this.meetingSettingsService.get(`users_forbid_delegator_to_vote`);
-
-    protected voteRequestData: IdentifiedVotingData = {};
-
-    protected alreadyVoted: Record<number, boolean> = {};
-
-    protected deliveringVote: Record<number, boolean> = {};
-
-    protected user!: ViewUser;
-
-    private _isReady = false;
-    private _poll!: ViewPoll<C>;
-    private _delegationsMap: Record<number, ViewUser> = {};
-    private _canVoteForSubjectMap: Record<number, BehaviorSubject<boolean>> = {};
-
-    private voteRepo = inject(VoteControllerService);
-
-    protected votingService = inject(VotingService);
-    protected cd = inject(ChangeDetectorRef);
-    private pollRepo = inject(PollControllerService);
-    private operator = inject(OperatorService);
-    private viewport = inject(ViewPortService);
-    private votedSubscription: Subscription;
-    private votedSubscriptionPollId: Id;
-
-    public constructor(private meetingSettingsService: MeetingSettingsService) {
-        super();
-        this.updatePollOptionTitleWidth();
-        this.subscriptions.push(
-            this.operator.userObservable.pipe(debounceTime(50)).subscribe(user => {
-                if (
-                    user &&
-                    (!user.getMeetingUser()?.vote_delegated_to_id || user.getMeetingUser()?.vote_delegated_to)
-                ) {
-                    this.user = user;
-                    this.delegations = user.vote_delegations_from();
-                    this.voteRequestData[this.user.id] = { value: {} } as VotingData;
-                    if (this.poll.hasVoted !== undefined) {
-                        this.alreadyVoted[this.user.id] = this.poll.hasVoted;
-                    }
-                    if (this.delegations && this.poll.user_has_voted_for_delegations !== undefined) {
-                        this.setupDelegations(this.poll.user_has_voted_for_delegations);
-                    }
-
-                    this.setupHasVotedSubscription();
-                    this._isReady = true;
-                    this.cd.markForCheck();
-                }
-            }),
-            this.translate.onLangChange.subscribe(() => {
-                this.updatePollOptionTitleWidth();
-            }),
-            combineLatest([
-                this.meetingSettingsService.get(`users_enable_vote_delegations`).pipe(distinctUntilChanged()),
-                this.meetingSettingsService.get(`users_forbid_delegator_to_vote`).pipe(distinctUntilChanged())
-            ]).subscribe(_ => {
-                for (const key of Object.keys(this._canVoteForSubjectMap)) {
-                    this._canVoteForSubjectMap[+key].next(this.canVote(this._delegationsMap[+key]));
-                }
-            }),
-            this.viewport.isMobileSubject.subscribe(() => {
-                this.cd.markForCheck();
-            })
-        );
-    }
-
-    public ngOnInit(): void {
-        this.defineVoteOptions();
-        this.cd.markForCheck();
-    }
-
-    private updatePollOptionTitleWidth(): void {
-        document.documentElement.style.setProperty(
-            `--poll-option-title-width`,
-            `${Math.max(
-                Math.max(...this.voteOptions.map(option => this.translate.instant(option.label).length * 9)),
-                70
-            )}px`
-        );
-    }
-
-    public isDeliveringVote(user: ViewUser = this.user): boolean {
-        return this.deliveringVote[user?.id];
-    }
-
-    public hasAlreadyVoted(user: ViewUser = this.user): boolean {
-        return this.alreadyVoted[user?.id];
-    }
-
-    public canVoteForObservable(user: ViewUser = this.user): Observable<boolean> {
-        if (!this._canVoteForSubjectMap[user.id]) {
-            this._canVoteForSubjectMap[user.id] = new BehaviorSubject(this.canVote(user));
-        }
-        return this._canVoteForSubjectMap[user.id];
-    }
-
-    public getVotingError(user: ViewUser = this.user): string {
-        return this.votingService.getVotingProhibitionReasonVerbose(this.poll, user) || ``;
-    }
-
-    public getVotingErrorFromName(errorName: string): string {
-        return this.votingService.getVotingProhibitionReasonVerboseFromName(errorName) || ``;
-    }
-
-    public getVotesCount(user: ViewUser = this.user): number {
-        if (this.voteRequestData[user?.id]) {
-            if (this.poll.isMethodY && this.poll.max_votes_per_option > 1 && !this.isGlobalOptionSelected(user)) {
-                return Object.keys(this.voteRequestData[user.id].value)
-                    .map(key => parseInt(this.voteRequestData[user.id].value[+key] as string, 10))
-                    .reduce((a, b) => a + b, 0);
-            } else {
-                return Object.keys(this.voteRequestData[user.id].value).filter(
-                    key => this.voteRequestData[user.id].value[+key]
-                ).length;
-            }
-        }
-        return 0;
-    }
-
-    public getVotesAvailable(user: ViewUser = this.user): number | string {
-        if (this.isGlobalOptionSelected()) {
-            return `-`;
-        }
-        return this.poll.max_votes_amount - this.getVotesCount(user);
-    }
-
-    public getFormControl(optionId: number): UntypedFormControl {
-        if (!this.formControlMap[optionId]) {
-            this.formControlMap[optionId] = new UntypedFormControl(0, [
-                Validators.required,
-                Validators.min(0),
-                Validators.max(this.poll.max_votes_per_option)
-            ]);
-        }
-        return this.formControlMap[optionId];
-    }
-
-    public getErrorInVoteEntry(optionId: number): string {
-        if (this.formControlMap[optionId].hasError(`required`)) {
-            return this.translate.instant(`This is not a number.`);
-        } else if (this.formControlMap[optionId].hasError(`min`)) {
-            return this.translate.instant(`Negative votes are not allowed.`);
-        } else if (this.formControlMap[optionId].hasError(`max`)) {
-            return this.translate.instant(`Too many votes on one option.`);
-        }
-        return ``;
-    }
-
-    public abstract getActionButtonClass(actions: VoteOption, option: ViewOption, user: ViewUser): string;
-
-    public getActionButtonContentClass(voteOption: VoteOption, option: ViewOption, user: ViewUser = this.user): string {
-        return this.getActionButtonClass(voteOption, option, user) ? `` : `button-content-opaque`;
-    }
-
-    public getGlobalButtonContentClass(option: VoteOption, user: ViewUser = this.user): string {
-        return this.getGlobalCSSClass(option, user) ? `` : `button-content-opaque`;
-    }
-
-    protected isGlobalOptionSelected(user: ViewUser = this.user): boolean {
-        const value = this.voteRequestData[user.id]?.value;
-        return value === `Y` || value === `N` || value === `A`;
-    }
-
-    public saveGlobalVote(globalVote: GlobalVote, user: ViewUser = this.user): void {
-        if (this.voteRequestData[user.id].value && this.voteRequestData[user.id].value === globalVote) {
-            this.voteRequestData[user.id].value = {};
-            if (this.poll.isMethodY && this.poll.max_votes_per_option > 1) {
-                this.enableInputs();
-            }
-        } else {
-            this.voteRequestData[user.id].value = globalVote;
-            if (this.poll.isMethodY && this.poll.max_votes_per_option > 1) {
-                this.disableAndResetInputs();
-            }
-            this.submitVote(user);
-        }
-    }
-
-    public async submitVote(user: ViewUser, value: any = undefined): Promise<void> {
-        this.deliveringVote[user.id] = true;
-        this.cd.markForCheck();
-
-        const votePayload = {
-            value: value,
-            user_id: user.id
-        };
-
-        await this.sendVote(user.id, votePayload);
-    }
-
-    public getGlobalCSSClass(option: VoteOption, user: ViewUser = this.user): string {
-        if (this.voteRequestData[user.id]?.value === option.vote) {
-            return `button-content-not-opaque`;
-        }
-        return ``;
-    }
-
-    public getGlobalOptionName(option: VoteOption): string {
-        switch (option.label) {
-            case `Yes`:
-                return `General approval`;
-            case `No`:
-                return `General rejection`;
-            default:
-                return `General ` + option.label.toLowerCase();
-        }
-    }
-
-    public saveMultipleVotes(optionId: number, event: any, user: ViewUser = this.user): void {
-        let vote = parseInt(event.target.value, 10);
-
-        if (isNaN(vote) || vote > this.poll.max_votes_per_option || vote < 0) {
-            vote = 0;
-        }
-
-        if (!this.voteRequestData[user.id]) {
-            throw new Error(`The user for your voting request does not exist`);
-        }
-
-        if (this.isGlobalOptionSelected(user)) {
-            delete this.voteRequestData[user.id].value;
-        }
-
-        if (this.poll.isMethodY && this.poll.max_votes_per_option > 1) {
-            this.saveMultipleVotesMultiVoteMethodY(optionId, vote, user);
-        }
-    }
-
-    public abstract saveSingleVote(optionId: number, vote: VoteValue, user: ViewUser): void;
-    public abstract shouldStrikeOptionText(option: ViewOption, user: ViewUser): boolean;
-
-    protected async sendVote(userId: Id, votePayload: any): Promise<void> {
-        try {
-            await this.pollRepo.vote(this.poll, votePayload);
-            this.alreadyVoted[userId] = true;
-            this.poll.hasVoted = true; // Set it manually to `true`, because the server will do the same
-        } catch (e: any) {
-            this.raiseError(e);
-        } finally {
-            this.deliveringVote[userId] = false;
-            this.cd.markForCheck();
-        }
-    }
-
-    protected isErrorInVoteEntry(): boolean {
-        for (const key in this.formControlMap) {
-            if (Object.prototype.hasOwnProperty.call(this.formControlMap, key) && this.formControlMap[key].invalid) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private saveMultipleVotesMultiVoteMethodY(optionId: number, vote: number, user: ViewUser = this.user): void {
-        // Another option is not expected here
-        const maxVotesAmount = this.poll.max_votes_amount;
-        const tmpVoteRequest = this.getTmpVoteRequestMultipleVotes(optionId, vote, user);
-
-        // check if you can still vote
-        const countedVotes = Object.keys(tmpVoteRequest)
-            .map(key => parseInt(tmpVoteRequest[key], 10))
-            .reduce((a, b) => a + b, 0);
-        if (countedVotes <= maxVotesAmount) {
-            this.voteRequestData[user.id].value = tmpVoteRequest;
-
-            // if you have no options anymore, try to send
-            if (this.getVotesCount(user) === maxVotesAmount && !this.isErrorInVoteEntry()) {
-                this.submitVote(user);
-            }
-        } else {
-            this.raiseError(
-                this.translate.instant(`You reached the maximum amount of votes. Deselect one option first.`)
-            );
-            this.formControlMap[optionId].setValue(this.voteRequestData[user.id].value[optionId]);
-        }
-    }
-
-    private getTmpVoteRequestMultipleVotes(
-        optionId: number,
-        vote: number,
-        user: ViewUser = this.user
-    ): Record<number, number> {
-        const maxVotesAmount = this.poll.max_votes_amount;
-        const maxVotesPerOption = this.poll.max_votes_per_option;
-        return this.poll.options
-            .map(option => option.id)
-            .reduce((output, next_id) => {
-                output[next_id] = this.voteRequestData[user.id].value[next_id];
-                output[next_id] = output[next_id] ? output[next_id] : 0;
-                if (next_id === optionId) {
-                    if (vote > Math.min(maxVotesPerOption, maxVotesAmount)) {
-                        output[next_id] = Math.min(maxVotesPerOption, maxVotesAmount);
-                    } else if (vote >= 0) {
-                        output[next_id] = vote;
-                    }
-                }
-                return output;
-            }, {});
-    }
-
-    private enableInputs(): void {
-        for (const key in this.formControlMap) {
-            if (Object.prototype.hasOwnProperty.call(this.formControlMap, key)) {
-                this.formControlMap[key].enable();
-            }
-        }
-    }
-
-    private disableAndResetInputs(): void {
-        for (const key in this.formControlMap) {
-            if (Object.prototype.hasOwnProperty.call(this.formControlMap, key)) {
-                this.formControlMap[key].setValue(0);
-                this.formControlMap[key].disable();
-            }
-        }
-    }
-
-    private updatePoll(): void {
-        if (this._isReady) {
-            this.setupHasVotedSubscription();
-        }
-        this.defineVoteOptions();
-        this.cd.markForCheck();
-    }
-
-    private setupHasVotedSubscription(): void {
-        if (!this.votedSubscription || this.votedSubscription.closed || this.votedSubscriptionPollId !== this.poll.id) {
-            if (this.votedSubscription) {
-                this.votedSubscription.unsubscribe();
-            }
-
-            this.votedSubscription = this.voteRepo.subscribeVoted(this.poll).subscribe(votedFor => {
-                if (votedFor[this.poll.id] === undefined) {
-                    return;
-                }
-
-                const votes = votedFor[this.poll.id] || [];
-                if (
-                    ((!this.poll.live_votes && votes.length > 0) ||
-                        votes.filter(m => this.poll.live_votes[m] !== undefined).length > 0) &&
-                    this.poll.hasVoted
-                ) {
-                    return;
-                }
-                if (this.user) {
-                    this.alreadyVoted[this.user.id] = votes.includes(this.user.id);
-                    if (this.delegations) {
-                        this.setupDelegations(votes);
-                    }
-                }
-
-                for (const key of Object.keys(this._canVoteForSubjectMap)) {
-                    this._canVoteForSubjectMap[+key].next(this.canVote(this._delegationsMap[+key]));
-                }
-
-                this.cd.markForCheck();
-            });
-            this.votedSubscriptionPollId = this.poll.id;
-            this.subscriptions.push(this.votedSubscription);
-        }
-    }
-
-    private setupDelegations(votedFor: Id[]): void {
-        for (const delegation of this.delegations) {
-            this._delegationsMap[delegation.id] = delegation;
-            this.alreadyVoted[delegation.id] = votedFor.includes(delegation.id);
-            if (!this.voteRequestData[delegation.id]) {
-                this.voteRequestData[delegation.id] = { value: {} } as VotingData;
-                this.deliveringVote[delegation.id] = false;
-            }
-        }
-    }
-
-    private canVote(user: ViewUser = this.user): boolean {
-        return (
-            this.votingService.canVote(this.poll, user) &&
-            !this.isDeliveringVote(user) &&
-            !this.hasAlreadyVoted(user) &&
-            this.hasAlreadyVoted(user) !== undefined
-        );
-    }
-
-    private defineVoteOptions(): void {
-        this.voteActions = [];
-        this.globalVoteActions = [];
-        if (this.poll) {
-            const globals = {
-                Y: this.poll.global_yes,
-                N: this.poll.global_no,
-                A: this.poll.global_abstain
-            };
-
-            for (const option of this.voteOptions) {
-                if (this.poll.pollmethod?.includes(option.vote)) {
-                    this.voteActions.push(option);
-                }
-
-                if (globals[option.vote]) {
-                    this.globalVoteActions.push(option);
-                }
-            }
-        }
-    }
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.html
index 4743c725d7..aea6042ea5 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.html
@@ -1,40 +1,28 @@
 <div class="centered-button-wrapper">
     <!-- Success -->
-    @if (hasAlreadyVoted && !isDeliveringVote) {
+    @if (hasAlreadyVoted() && !isDeliveringVote()) {
         <div>
             <mat-icon class="vote-submitted">check_circle</mat-icon>
             <br />
             <span>{{ 'Voting successful.' | translate }}</span>
         </div>
-    }
-
-    <!-- Delivering -->
-    @if (isDeliveringVote) {
+    } @else if (isDeliveringVote()) {
+        <!-- Delivering -->
         <div class="submit-vote-indicator">
             <mat-spinner class="small-spinner"></mat-spinner>
             <br />
             <span>{{ 'Delivering vote... Please wait!' | translate }}</span>
         </div>
-    }
-    @if (hasAlreadyVoted === undefined) {
+    } @else if (hasAlreadyVoted() === undefined) {
         <div>
             <mat-spinner class="small-spinner"></mat-spinner>
             <br />
             <span>{{ 'Retrieving vote status... Please wait!' | translate }}</span>
         </div>
-    }
-    @if (hasAlreadyVoted !== undefined) {
+    } @else if (reason()) {
         <!-- Permission error error -->
-        @if (!hasAlreadyVoted && !isDeliveringVote && !(!isUserPresent && hasDelegations)) {
-            <div>
-                <span>{{ getVotingError(delegationUser) | translate }}</span>
-            </div>
-        }
-        <!-- Delegation not present vote error -->
-        @if (!hasAlreadyVoted && !isDeliveringVote && !isUserPresent && hasDelegations) {
-            <div>
-                <span>{{ getVotingErrorFromName('USER_NOT_PRESENT') | translate }}</span>
-            </div>
-        }
+        <div>
+            <span>{{ getVotingErrorFromName(reason()) | translate }}</span>
+        </div>
     }
 </div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts
index 4a2b3a5e64..cdb07642ec 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts
@@ -1,70 +1,54 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core';
-import { combineLatest, debounceTime, distinctUntilChanged } from 'rxjs';
+import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core';
+import { rxResource, toSignal } from '@angular/core/rxjs-interop';
+import { MatIconModule } from '@angular/material/icon';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { TranslatePipe } from '@ngx-translate/core';
 import { OperatorService } from 'src/app/site/services/operator.service';
 
 import { BaseMeetingComponent } from '../../../../base/base-meeting.component';
 import { ViewPoll } from '../../../../pages/polls';
 import { ViewUser } from '../../../../view-models/view-user';
-import { VotingService } from '../../services/voting.service';
+import { VotingProhibition, VotingService } from '../../services/voting.service';
 
 @Component({
     selector: `os-poll-cannot-vote-message`,
     templateUrl: `./poll-cannot-vote-message.component.html`,
     styleUrls: [`./poll-cannot-vote-message.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
+    imports: [TranslatePipe, MatIconModule, MatProgressSpinnerModule],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PollCannotVoteMessageComponent extends BaseMeetingComponent {
-    @Input()
-    public delegationUser: ViewUser;
+    public poll = input.required<ViewPoll>();
+    public user = input.required<ViewUser>();
 
-    @Input()
-    public hasAlreadyVoted: boolean;
+    public reason = input<VotingProhibition>();
 
-    @Input()
-    public isDeliveringVote = false;
+    public isDeliveringVote = input(false);
+    public hasDelegations = input(false);
 
-    @Input()
-    public hasDelegations = false;
-
-    @Input()
-    public poll: ViewPoll;
-
-    public user: ViewUser;
+    public hasAlreadyVoted = computed(() => {
+        return this.hasVoted.hasValue() && this.hasVoted.value();
+    });
 
     public get isUserPresent(): boolean {
-        return this.user?.isPresentInMeeting();
+        return this.actingUser().isPresentInMeeting();
     }
 
-    public constructor(
-        operator: OperatorService,
-        private votingService: VotingService,
-        private cd: ChangeDetectorRef
-    ) {
+    private operator = inject(OperatorService);
+    private votingService = inject(VotingService);
+
+    private actingUser = toSignal(this.operator.userObservable);
+
+    public constructor() {
         super();
-        this.subscriptions.push(
-            operator.userObservable.pipe(debounceTime(50)).subscribe(user => {
-                if (user) {
-                    this.user = user;
-                }
-                this.cd.markForCheck();
-            })
-        );
-        this.subscriptions.push(
-            combineLatest([
-                this.meetingSettingsService.get(`users_enable_vote_delegations`).pipe(distinctUntilChanged()),
-                this.meetingSettingsService.get(`users_forbid_delegator_to_vote`).pipe(distinctUntilChanged())
-            ]).subscribe(_ => {
-                this.cd.markForCheck();
-            })
-        );
     }
 
-    public getVotingError(user: ViewUser = this.user): string {
-        return this.votingService.getVotingProhibitionReasonVerbose(this.poll, user) || ``;
-    }
+    public hasVoted = rxResource({
+        params: () => ({ poll: this.poll(), user: this.user() }),
+        stream: ({ params }) => this.votingService.hasVoted(params.poll, params.user)
+    });
 
-    public getVotingErrorFromName(errorName: string): string {
+    public getVotingErrorFromName(errorName: VotingProhibition): string {
         return this.votingService.getVotingProhibitionReasonVerboseFromName(errorName) || ``;
     }
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts
index bbc7746642..51656a3ab1 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit } from '@angular/core';
-import { PollPercentBase, VoteValue, VoteValueVerbose } from 'src/app/domain/models/poll';
+import { VoteValue, VoteValueVerbose } from 'src/app/domain/models/poll';
 import { ThemeService } from 'src/app/site/services/theme.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
-import { ViewPoll, ViewVote } from '../../../../pages/polls';
+import { ViewBallot, ViewPoll } from '../../../../pages/polls';
 import { MeetingSettingsService } from '../../../../services/meeting-settings.service';
 import { VotesFilterService } from '../../services/votes-filter.service';
 
@@ -46,11 +46,11 @@ export class PollFilteredVotesChartComponent extends BaseUiComponent implements
         this.subscriptions.push(this.filterService.outputObservable.subscribe(votes => this.onVotesUpdated(votes)));
     }
 
-    private onVotesUpdated(votes: ViewVote[]): void {
+    private onVotesUpdated(votes: ViewBallot[]): void {
         this.voteAmounts = [];
-        const voteValues: VoteValue[] = this.poll.isMethodYN ? [`Y`, `N`] : [`Y`, `N`, `A`];
+        const voteValues: VoteValue[] = !this.poll.config?.allow_abstain ? [`Y`, `N`] : [`Y`, `N`, `A`];
         const baseVoteValues: VoteValue[] =
-            this.poll.onehundred_percent_base === PollPercentBase.YN ? [`Y`, `N`] : [`Y`, `N`, `A`];
+            this.poll.config?.onehundred_percent_base === `yes_no` ? [`Y`, `N`] : [`Y`, `N`, `A`];
         const countedVotes = votes.filter(v => baseVoteValues.indexOf(v.value) !== -1);
         for (const i in voteValues) {
             const voteValue = voteValues[i];
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html
new file mode 100644
index 0000000000..f85d4fbbf6
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.html
@@ -0,0 +1,22 @@
+<form [formGroup]="approvalForm">
+    <div class="margin-bottom-15 info-grid">
+        <mat-form-field>
+            <mat-label>{{ 'Election method' | translate }}</mat-label>
+            <mat-select formControlName="allow_abstain">
+                <mat-option [value]="false">{{ 'Yes/No' | translate }}</mat-option>
+                <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
+            </mat-select>
+        </mat-form-field>
+    </div>
+
+    <mat-form-field>
+        <mat-label>{{ '100% base' | translate }}</mat-label>
+        <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+            @for (option of validPercentBases | keyvalue; track option) {
+                <mat-option [value]="option.key">
+                    {{ option.value | translate }}
+                </mat-option>
+            }
+        </mat-select>
+    </mat-form-field>
+</form>
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss
similarity index 100%
rename from client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.scss
rename to client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.scss
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts
new file mode 100644
index 0000000000..dfacc89d48
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component.ts
@@ -0,0 +1,57 @@
+import { KeyValuePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, inject, Input } from '@angular/core';
+import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslatePipe } from '@ngx-translate/core';
+import { ApprovalOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-approval';
+
+import { ViewPoll } from '../../../../pages/polls';
+
+@Component({
+    selector: 'os-poll-form-approval',
+    imports: [ReactiveFormsModule, MatFormFieldModule, MatSelectModule, MatCheckboxModule, TranslatePipe, KeyValuePipe],
+    templateUrl: './poll-form-approval.component.html',
+    styleUrl: './poll-form-approval.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollFormApprovalComponent {
+    public approvalForm: UntypedFormGroup;
+
+    private _data: Partial<ViewPoll>;
+
+    public validPercentBases: Record<ApprovalOnehundredPercentBase, string> = {
+        yes_no: 'Valid (Yes/No)',
+        valid: 'Valid',
+        cast: 'Cast',
+        entitled: 'Entitled',
+        entitled_present: 'Entitled present',
+        disabled: 'Disabled'
+    };
+
+    @Input()
+    public set data(data: Partial<ViewPoll>) {
+        this._data = data;
+        if (data && this.approvalForm) {
+            const patch: Record<string, any> = {};
+            if (data.config?.allow_abstain !== undefined) patch[`allow_abstain`] = data.config.allow_abstain;
+            if (data.config?.onehundred_percent_base !== undefined)
+                patch[`onehundred_percent_base`] = data.config.onehundred_percent_base;
+            this.approvalForm.patchValue(patch);
+        }
+    }
+
+    public get data(): Partial<ViewPoll> {
+        return this._data;
+    }
+
+    private fb = inject(UntypedFormBuilder);
+
+    public constructor() {
+        this.approvalForm = this.fb.group({
+            onehundred_percent_base: [`valid`],
+            allow_abstain: [false]
+        });
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html
new file mode 100644
index 0000000000..3451bd1be9
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.html
@@ -0,0 +1,34 @@
+<form [formGroup]="form">
+    <div class="poll-preview-meta-info-form">
+        <div class="margin-bottom-15 info-grid">
+            <mat-form-field>
+                <mat-label>{{ 'Election method' | translate }}</mat-label>
+                <mat-select formControlName="allow_abstain">
+                    <mat-option [value]="false">{{ 'Yes/No' | translate }}</mat-option>
+                    <mat-option [value]="true">{{ 'Yes/No/Abstain' | translate }}</mat-option>
+                </mat-select>
+            </mat-form-field>
+
+            <mat-form-field>
+                <mat-label>{{ 'Min amount of votes' | translate }}</mat-label>
+                <input formControlName="min_options_amount" matInput required type="number" />
+            </mat-form-field>
+
+            <mat-form-field>
+                <mat-label>{{ 'Max amount of votes' | translate }}</mat-label>
+                <input formControlName="max_options_amount" matInput required type="number" />
+            </mat-form-field>
+        </div>
+
+        <mat-form-field>
+            <mat-label>{{ '100% base' | translate }}</mat-label>
+            <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                @for (option of validPercentBases | keyvalue; track option) {
+                    <mat-option [value]="option.key">
+                        {{ option.value | translate }}
+                    </mat-option>
+                }
+            </mat-select>
+        </mat-form-field>
+    </div>
+</form>
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.scss
similarity index 100%
rename from client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.scss
rename to client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.scss
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts
new file mode 100644
index 0000000000..5672534aa7
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component.ts
@@ -0,0 +1,52 @@
+import { KeyValuePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core';
+import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslatePipe } from '@ngx-translate/core';
+import { RatingApprovalOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-rating-approval';
+
+import { ViewPoll } from '../../../../pages/polls';
+
+@Component({
+    selector: 'os-poll-form-rating-approval',
+    imports: [
+        ReactiveFormsModule,
+        MatFormFieldModule,
+        MatSelectModule,
+        MatCheckboxModule,
+        MatInputModule,
+        TranslatePipe,
+        KeyValuePipe
+    ],
+    templateUrl: './poll-form-rating-approval.component.html',
+    styleUrls: [`../poll-form/poll-form.component.scss`, `./poll-form-rating-approval.component.scss`],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollFormRatingApprovalComponent {
+    public form: UntypedFormGroup;
+
+    public validPercentBases: Record<RatingApprovalOnehundredPercentBase, string> = {
+        yes_no: 'Valid (Yes/No)',
+        valid: 'Valid',
+        cast: 'Cast',
+        entitled: 'Entitled',
+        entitled_present: 'Entitled present',
+        disabled: 'Disabled'
+    };
+
+    public data = input<Partial<ViewPoll>>();
+
+    private fb = inject(UntypedFormBuilder);
+
+    public constructor() {
+        this.form = this.fb.group({
+            onehundred_percent_base: [`valid`],
+            allow_abstain: [false],
+            max_options_amount: [1],
+            min_options_amount: [1]
+        });
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html
new file mode 100644
index 0000000000..6dd8a2ae6b
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.html
@@ -0,0 +1,46 @@
+<form [formGroup]="form">
+    <div class="margin-bottom-15">
+        <mat-form-field>
+            <mat-label>{{ 'Election method' | translate }}</mat-label>
+            <mat-select formControlName="strike_out">
+                <mat-option [value]="false">{{ 'Approval voting' | translate }}</mat-option>
+                <mat-option [value]="true">{{ 'Disapproval voting' | translate }}</mat-option>
+            </mat-select>
+        </mat-form-field>
+    </div>
+
+    <div class="poll-preview-meta-info-form">
+        <div class="info-grid">
+            <mat-checkbox formControlName="allow_nota">
+                @if (form.get('strike_out').value) {
+                    {{ 'General approval' | translate }}
+                } @else {
+                    {{ 'General rejection' | translate }}
+                }
+            </mat-checkbox>
+
+            <mat-form-field>
+                <mat-label>{{ 'Min amount of votes' | translate }}</mat-label>
+                <input formControlName="min_options_amount" matInput required type="number" />
+            </mat-form-field>
+
+            <mat-form-field>
+                <mat-label>{{ 'Max amount of votes' | translate }}</mat-label>
+                <input formControlName="max_options_amount" matInput required type="number" />
+            </mat-form-field>
+        </div>
+
+        <div class="margin-bottom-15">
+            <mat-form-field>
+                <mat-label>{{ '100% base' | translate }}</mat-label>
+                <mat-select formControlName="onehundred_percent_base" panelClass="percent-base-panel" required>
+                    @for (option of validPercentBases | keyvalue; track option) {
+                        <mat-option [value]="option.key">
+                            {{ option.value | translate }}
+                        </mat-option>
+                    }
+                </mat-select>
+            </mat-form-field>
+        </div>
+    </div>
+</form>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.scss
new file mode 100644
index 0000000000..530dfd8d12
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.scss
@@ -0,0 +1,9 @@
+.option-section {
+    margin-top: 16px;
+
+    .option-section-title {
+        margin: 0 0 8px;
+        font-size: 14px;
+        font-weight: 500;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.spec.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.spec.ts
new file mode 100644
index 0000000000..9c7065a078
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PollFormSelectionComponent } from './poll-form-selection.component';
+
+describe('PollFormSelectionComponent', () => {
+    let component: PollFormSelectionComponent;
+    let fixture: ComponentFixture<PollFormSelectionComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PollFormSelectionComponent]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(PollFormSelectionComponent);
+        component = fixture.componentInstance;
+        await fixture.whenStable();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts
new file mode 100644
index 0000000000..77b58089c7
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component.ts
@@ -0,0 +1,59 @@
+import { KeyValuePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, effect, inject, input } from '@angular/core';
+import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslatePipe } from '@ngx-translate/core';
+import { SelectionOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-selection';
+
+import { ViewPoll } from '../../../../pages/polls';
+
+@Component({
+    selector: 'os-poll-form-selection',
+    imports: [ReactiveFormsModule, MatCheckboxModule, MatInputModule, MatSelectModule, TranslatePipe, KeyValuePipe],
+    templateUrl: './poll-form-selection.component.html',
+    styleUrls: [`../poll-form/poll-form.component.scss`, './poll-form-selection.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollFormSelectionComponent {
+    public form: UntypedFormGroup;
+
+    public validPercentBases: Record<SelectionOnehundredPercentBase, string> = {
+        no_general: 'Valid no general',
+        valid: 'Valid',
+        cast: 'Cast',
+        entitled: 'Entitled',
+        entitled_present: 'Entitled present',
+        disabled: 'Disabled'
+    };
+
+    public data = input.required<Partial<ViewPoll>>();
+
+    private fb = inject(UntypedFormBuilder);
+
+    public constructor() {
+        this.form = this.fb.group({
+            onehundred_percent_base: [`valid`],
+            strike_out: [false],
+            allow_nota: [false],
+            max_options_amount: [1],
+            min_options_amount: [1]
+        });
+
+        effect(this.onDataUpdated.bind(this));
+    }
+
+    private onDataUpdated(): void {
+        if (!this.data() || !this.form) {
+            return;
+        }
+
+        const patch: Record<string, any> = {};
+        for (const field of [`onehundred_percent_base`, `allow_nota`, `max_options_amount`, `min_options_amount`]) {
+            if (this.data().config && this.data().config[field] !== undefined) patch[field] = this.data().config[field];
+        }
+
+        this.form.patchValue(patch);
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html
new file mode 100644
index 0000000000..e1b65c305b
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.html
@@ -0,0 +1,75 @@
+<div class="os-form-card-mobile">
+    <!-- Poll Title -->
+    <form [formGroup]="pollForm">
+        <mat-form-field>
+            <mat-label>{{ 'Title' | translate }}</mat-label>
+            <h2 class="poll-preview-title">
+                <input formControlName="title" matInput required />
+            </h2>
+        </mat-form-field>
+
+        <div class="poll-preview-meta-info-form">
+            @if (!data || !data.state || data.isCreated) {
+                <div class="info-grid">
+                    <!-- Poll Visibility -->
+                    @if (isEVotingEnabled()) {
+                        <mat-form-field>
+                            <mat-label>{{ 'Visibility' | translate }}</mat-label>
+                            <mat-select formControlName="visibility" required>
+                                @for (entry of visibilityOptions | keyvalue; track entry.value) {
+                                    <mat-option [value]="entry.value">
+                                        {{ entry.value | translateKey: 'poll_visibility' }}
+                                    </mat-option>
+                                }
+                            </mat-select>
+                            @if (showNonNominalWarning) {
+                                <mat-icon color="primary" matSuffix (click)="openVotingWarning($event)">info</mat-icon>
+                            }
+                            <mat-error>{{ 'This field is required.' | translate }}</mat-error>
+                        </mat-form-field>
+                    }
+
+                    <!-- Groups entitled to Vote -->
+                    @if (isEVotingSelected) {
+                        <mat-form-field>
+                            <mat-label>{{ PollPropertyVerbose.groups | translate }}</mat-label>
+                            <os-repo-search-selector
+                                formControlName="entitled_group_ids"
+                                [multiple]="true"
+                                [pipeFn]="groupRepo.getFilterSystemGroupFn()"
+                                [repo]="groupRepo"
+                                [showChips]="false"
+                                [sortFn]="sortFn"
+                            ></os-repo-search-selector>
+                        </mat-form-field>
+                    }
+                </div>
+
+                <div class="margin-bottom-15">
+                    <!-- Live voting -->
+                    @if (isLiveVotingAvailable) {
+                        <mat-checkbox formControlName="live_voting_enabled">
+                            {{ 'Live voting' | translate }}
+                        </mat-checkbox>
+                        <mat-hint>
+                            {{ 'Allows single votes projection during voting process' | translate }}
+                        </mat-hint>
+                    }
+                </div>
+            }
+        </div>
+    </form>
+
+    <ng-content></ng-content>
+
+    @if (optionEdit()) {
+        <div class="option-section">
+            <h4 class="option-section-title">{{ 'Options' | translate }}</h4>
+            <os-editable-list
+                placeholder="New option"
+                [items]="pollForm.get('options').value"
+                (itemsChange)="onOptionsChange($event)"
+            />
+        </div>
+    }
+</div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.scss
similarity index 95%
rename from client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss
rename to client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.scss
index c544c079f4..fa1ab1a2bd 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.scss
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.scss
@@ -8,6 +8,10 @@
         display: grid;
         column-gap: 1em;
         grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+
+        > mat-checkbox {
+            padding-top: 10px;
+        }
     }
 
     .flex-info-grid {
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts
new file mode 100644
index 0000000000..a65e03da49
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component.ts
@@ -0,0 +1,163 @@
+import { KeyValuePipe } from '@angular/common';
+import { Component, inject, Input, input, OnInit, ViewEncapsulation } from '@angular/core';
+import { AbstractControl, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialog } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslatePipe } from '@ngx-translate/core';
+import { combineLatest, startWith } from 'rxjs';
+import { PollPropertyVerbose, PollPropertyVerboseKey, PollVisibility } from 'src/app/domain/models/poll';
+import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
+import { BaseComponent } from 'src/app/site/base/base.component';
+import { DirectivesModule } from 'src/app/ui/directives';
+import { EditableListComponent } from 'src/app/ui/modules/editable-list';
+import { SearchSelectorModule } from 'src/app/ui/modules/search-selector';
+import { PipesModule } from 'src/app/ui/pipes';
+
+import { GroupControllerService, ViewGroup } from '../../../../pages/participants';
+import { ViewPoll } from '../../../../pages/polls';
+import { VotingPrivacyWarningDialogComponent } from '../voting-privacy-warning/voting-privacy-warning-dialog.component';
+
+@Component({
+    selector: `os-poll-form`,
+    templateUrl: `./poll-form.component.html`,
+    styleUrls: [`./poll-form.component.scss`],
+    imports: [
+        EditableListComponent,
+        TranslatePipe,
+        MatInputModule,
+        MatFormFieldModule,
+        MatCheckboxModule,
+        MatSelectModule,
+        SearchSelectorModule,
+        DirectivesModule,
+        PipesModule,
+        KeyValuePipe,
+        ReactiveFormsModule
+    ],
+    encapsulation: ViewEncapsulation.None
+})
+export class PollFormComponent extends BaseComponent implements OnInit {
+    public pollForm: UntypedFormGroup;
+
+    public PollPropertyVerbose: Record<PollPropertyVerboseKey, string> = PollPropertyVerbose;
+
+    public readonly visibilityOptions = PollVisibility;
+
+    public showNonNominalWarning = false;
+
+    public optionType = input<'meeting_user' | 'text'>('text');
+    public optionEdit = input<boolean>(false);
+    public isEVotingEnabled = input.required<boolean>();
+
+    public sortFn = (groupA: ViewGroup, groupB: ViewGroup): number => groupA.weight - groupB.weight;
+
+    private _data: Partial<ViewPoll>;
+
+    @Input()
+    public set data(data: Partial<ViewPoll>) {
+        this._data = data;
+        if (data && this.pollForm) {
+            const patch: Record<string, any> = {};
+            if (data.title !== undefined) patch[`title`] = data.title;
+            if (data.visibility !== undefined) patch[`visibility`] = data.visibility;
+            if (data.entitled_group_ids !== undefined) patch[`entitled_group_ids`] = data.entitled_group_ids;
+            if (data.live_voting_enabled !== undefined) patch[`live_voting_enabled`] = !!data.live_voting_enabled;
+            this.pollForm.patchValue(patch);
+        }
+    }
+
+    public get data(): Partial<ViewPoll> {
+        return this._data;
+    }
+
+    public get isCreated(): boolean {
+        return !this.data?.state || this.data.isCreated;
+    }
+
+    public get isOpenVotingSelected(): boolean {
+        return this.pollTypeControl?.value === PollVisibility.Open || false;
+    }
+
+    public get isNamedVotingSelected(): boolean {
+        return this.pollTypeControl?.value === PollVisibility.Named || false;
+    }
+
+    public get isEVotingSelected(): boolean {
+        return this.isEVotingEnabled() && this.pollTypeControl?.value !== PollVisibility.Manually;
+    }
+
+    public get isLiveVotingAvailable(): boolean {
+        return this.isEVotingSelected && (this.isNamedVotingSelected || this.isOpenVotingSelected);
+    }
+
+    private get pollTypeControl(): AbstractControl {
+        return this.pollForm.get(`visibility`);
+    }
+
+    private get liveVotingControl(): AbstractControl {
+        return this.pollForm.get(`live_voting_enabled`);
+    }
+
+    private fb = inject(UntypedFormBuilder);
+    public groupRepo = inject(GroupControllerService);
+    private dialog = inject(MatDialog);
+
+    public constructor() {
+        super();
+        this.initContentForm();
+    }
+
+    public ngOnInit(): void {
+        this.subscriptions.push(
+            combineLatest([
+                this.pollForm.valueChanges.pipe(startWith(``)),
+                this.pollTypeControl.valueChanges.pipe(startWith(``))
+            ]).subscribe(() => {
+                this.updateLiveVotingEnabled();
+                this.setWarning();
+            })
+        );
+    }
+
+    public getValues(): Partial<{ [place in keyof ViewPoll]: any }> {
+        return { ...this.data, ...this.serializeForm(this.pollForm) };
+    }
+
+    public openVotingWarning(event: MouseEvent): void {
+        event.stopPropagation();
+        this.dialog.open(VotingPrivacyWarningDialogComponent, infoDialogSettings);
+    }
+
+    public onOptionsChange(items: string[]): void {
+        this.pollForm.get('options').setValue(items);
+    }
+
+    private updateLiveVotingEnabled(): void {
+        if (!this.isLiveVotingAvailable) {
+            this.liveVotingControl.setValue(false, { emitEvent: false });
+        }
+    }
+
+    private setWarning(): void {
+        this.showNonNominalWarning = this.pollTypeControl.value === PollVisibility.Secret;
+    }
+
+    private serializeForm(formGroup: UntypedFormGroup): Partial<ViewPoll> {
+        // getRawValue() includes disabled controls
+        return { ...formGroup.getRawValue() };
+    }
+
+    private initContentForm(): void {
+        this.pollForm = this.fb.group({
+            title: [``, Validators.required],
+            visibility: [PollVisibility.Open, Validators.required],
+            entitled_group_ids: [],
+            live_voting_enabled: [false],
+            option_type: ['text'],
+            options: [[]]
+        });
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.html
new file mode 100644
index 0000000000..5b802ca0a9
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.html
@@ -0,0 +1,93 @@
+<!-- Candidates -->
+@if (poll().options?.length) {
+    <small class="meta-info-left subtitle">
+        <div>
+            {{ 'Options' | translate }}:
+            <ul>
+                @for (option of poll().options; track option) {
+                    <li>{{ getOptionTitle(option) | translate }}</li>
+                    <!-- TODO: Also display subtitle if available -->
+                }
+            </ul>
+            <!-- TODO: Check if enumeration should be done -->
+            <!-- TODO: Special handling for list polls (approval + >=1 Options) -->
+        </div>
+        @if (hasGlobalOptionEnabled()) {
+            <div>
+                {{ 'Global options' | translate }}:
+                <ul>
+                    @if (generalApprovalAllowed()) {
+                        <li>{{ 'General approval' | translate }}</li>
+                    }
+                    @if (generalRejectionAllowed()) {
+                        <li>{{ 'General rejection' | translate }}</li>
+                    }
+                    @if (generalAbstainAllowed()) {
+                        <li>{{ 'General abstain' | translate }}</li>
+                    }
+                </ul>
+            </div>
+        }
+    </small>
+}
+
+<div class="meta-info-right subtitle">
+    <!-- Groups that can vote -->
+    @if (poll().entitled_groups && poll().isEVoting) {
+        <div>
+            {{ 'Entitled to vote' | translate }}:
+            @if (poll().entitled_groups.length) {
+                <os-comma-separated-listing [list]="poll().entitled_groups">
+                    <ng-template let-group>{{ group.getTitle() }}</ng-template>
+                </os-comma-separated-listing>
+            } @else {
+                <span>-</span>
+            }
+        </div>
+    }
+
+    @if (config().strike_out !== undefined || config().allow_abstain !== undefined) {
+        <div>
+            {{ 'Voting method' | translate }}:
+            @if (config().strike_out === true) {
+                <span>{{ 'Disapproval voting' | translate }}</span>
+            } @else if (config().strike_out === false) {
+                <span>{{ 'Approval voting' | translate }}</span>
+            } @else if (config().allow_abstain === true) {
+                <span>{{ 'Yes/No/Abstain' | translate }}</span>
+            } @else if (config().allow_abstain === false) {
+                <span>{{ 'Yes/No' | translate }}</span>
+            }
+        </div>
+    }
+
+    <!-- TODO: min_vote_sum, max_vote_sum -->
+    @if (config().min_options_amount > 1 || config().max_options_amount > 1) {
+        @if (config().min_options_amount === config().max_options_amount) {
+            {{ 'Votes' | translate }}:
+            <span>{{ config().min_options_amount }}</span>
+        } @else {
+            @if (config().min_options_amount > 1) {
+                {{ 'Minimum amount of votes' | translate }}:
+                <span>{{ config().min_options_amount }}</span>
+            }
+
+            @if (config().max_options_amount > 1) {
+                {{ 'Maximum amount of votes' | translate }}:
+                <span>{{ config().max_options_amount }}</span>
+            }
+        }
+    }
+
+    @if (config().max_votes_per_option > 1) {
+        {{ 'Maximum amount of votes per option' | translate }}:
+        <span>{{ config().max_votes_per_option }}</span>
+    }
+
+    @if (config().onehundred_percent_base !== undefined) {
+        <div>
+            {{ '100% base' | translate }}:
+            <span>{{ config().onehundred_percent_base | translateKey: 'poll_percent_base' }}</span>
+        </div>
+    }
+</div>
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.scss
similarity index 100%
rename from client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.scss
rename to client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.scss
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.ts
new file mode 100644
index 0000000000..b13566cfec
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-meta/poll-meta.component.ts
@@ -0,0 +1,57 @@
+import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
+import { TranslatePipe } from '@ngx-translate/core';
+import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing';
+import { TranslateKeyPipe } from 'src/app/ui/pipes/translate-key/translate-key.pipe';
+
+import {
+    ViewPoll,
+    ViewPollConfigApproval,
+    ViewPollConfigRatingApproval,
+    ViewPollConfigRatingScore,
+    ViewPollConfigSelection,
+    ViewPollConfigStvScottish,
+    ViewPollOption
+} from '../../../../pages/polls';
+
+@Component({
+    selector: 'os-poll-meta',
+    imports: [CommaSeparatedListingComponent, TranslatePipe, TranslateKeyPipe],
+    templateUrl: './poll-meta.component.html',
+    styleUrl: './poll-meta.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollMetaComponent {
+    public poll = input.required<ViewPoll>();
+
+    public config = computed<
+        Partial<
+            ViewPollConfigApproval &
+                ViewPollConfigRatingApproval &
+                ViewPollConfigRatingScore &
+                ViewPollConfigSelection &
+                ViewPollConfigStvScottish
+        >
+    >(() => {
+        return this.poll().config;
+    });
+
+    public hasGlobalOptionEnabled = computed<boolean>(() => {
+        return this.poll().config.allow_nota || this.poll().config.min_options_amount === 0;
+    });
+
+    public generalApprovalAllowed = computed<boolean>(() => {
+        return this.poll().config.allow_nota && this.poll().config.strike_out;
+    });
+
+    public generalRejectionAllowed = computed<boolean>(() => {
+        return this.poll().config.allow_nota && !this.poll().config.strike_out;
+    });
+
+    public generalAbstainAllowed = computed<boolean>(() => {
+        return this.poll().config.min_options_amount === 0;
+    });
+
+    public getOptionTitle(option: ViewPollOption): string {
+        return option.getOptionTitle().title;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.html
index 8d708f6dff..1d24839e80 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.html
@@ -1,9 +1,9 @@
-@if (canSeeProgressBar) {
+@if (canSeeProgressBar()) {
     <div class="poll-progress-wrapper">
         <div class="vote-number">
-            <span>{{ votescast }} / {{ max }}</span>
+            <span>{{ votescast() }} / {{ max() }}</span>
         </div>
         <span>{{ 'Received votes' | translate }}</span>
-        <mat-progress-bar class="voting-progress-bar" mode="determinate" [value]="valueInPercent"></mat-progress-bar>
+        <mat-progress-bar class="voting-progress-bar" mode="determinate" [value]="valueInPercent()"></mat-progress-bar>
     </div>
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts
index e6ad5451c3..2f3bef31a9 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts
@@ -1,4 +1,7 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal } from '@angular/core';
+import { rxResource, takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { TranslateModule } from '@ngx-translate/core';
 import { map } from 'rxjs';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
@@ -15,88 +18,88 @@ import { ActiveMeetingService } from '../../../../services/active-meeting.servic
     selector: `os-poll-progress`,
     templateUrl: `./poll-progress.component.html`,
     styleUrls: [`./poll-progress.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
+    imports: [MatProgressBarModule, TranslateModule],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class PollProgressComponent extends BaseUiComponent implements OnInit {
-    @Input()
-    public poll!: ViewPoll;
+export class PollProgressComponent extends BaseUiComponent {
+    public poll = input.required<ViewPoll>();
 
-    @Input()
-    public canManagePoll = false;
-
-    public max = 1;
+    public canManagePoll = computed(() => {
+        if (this.poll().isMotionPoll) {
+            return this.operator.hasPerms(Permission.motionCanManagePolls);
+        } else if (this.poll().isAssignmentPoll) {
+            return this.operator.hasPerms(Permission.assignmentCanManagePolls);
+        } else if (this.poll().isTopicPoll) {
+            return this.operator.hasPerms(Permission.pollCanManage);
+        }
+        return false;
+    });
 
-    public get votescast(): number {
-        return Object.keys(this.poll?.live_votes ?? {}).length;
-    }
+    public votescast = computed(() => {
+        return Object.keys(this.poll().ballot_ids ?? {}).length;
+    });
 
-    public get canSeeProgressBar(): boolean {
+    public canSeeProgressBar = computed(() => {
         if (!this.canSeeNames) {
             return false;
         }
-        return this.canManageSpeakers || this.canManagePoll;
-    }
+        return this.canManageSpeakers || this.canManagePoll();
+    });
 
-    private get canSeeNames(): boolean {
-        return this.operator.hasPerms(Permission.userCanSee);
-    }
+    public valueInPercent = computed(() => {
+        return (this.votescast() / this.max()) * 100;
+    });
 
-    private get canManageSpeakers(): boolean {
-        return this.operator.hasPerms(Permission.listOfSpeakersCanManage);
-    }
+    private canSeeNames = signal(false);
+    private canManageSpeakers = signal(false);
 
-    public constructor(
-        private autoupdate: AutoupdateService,
-        private userRepo: UserControllerService,
-        private operator: OperatorService,
-        private activeMeeting: ActiveMeetingService,
-        private modelRequestBuilder: ModelRequestBuilderService,
-        private cd: ChangeDetectorRef
-    ) {
-        super();
-    }
+    private autoupdate = inject(AutoupdateService);
+    private userRepo = inject(UserControllerService);
+    private operator = inject(OperatorService);
+    private activeMeeting = inject(ActiveMeetingService);
+    private modelRequestBuilder = inject(ModelRequestBuilderService);
+
+    public maxResource = rxResource({
+        params: () => ({ entitledGroupIds: this.poll().entitled_group_ids }),
 
-    public ngOnInit(): void {
-        if (this.poll) {
-            this.subscriptions.push(
-                this.userRepo
-                    .getViewModelListObservable()
-                    .pipe(
-                        map(users => {
-                            /**
-                             * Filter the users who would be able to vote:
-                             * They are present and don't have their vote right delegated
-                             * or the have their vote delegated to a user who is present.
-                             * They are in one of the voting groups
-                             */
-                            return users.filter(user => {
-                                const countable = user.isVoteCountable;
-                                const inVoteGroup = this.poll.entitled_group_ids.intersect(user.group_ids()).length;
+        stream: ({ params }) =>
+            this.userRepo.getViewModelListObservable().pipe(
+                map(users => {
+                    /**
+                     * Filter the users who would be able to vote:
+                     * They are present and don't have their vote right delegated
+                     * or the have their vote delegated to a user who is present.
+                     * They are in one of the voting groups
+                     */
+                    return users.filter(user => {
+                        const countable = user.isVoteCountable;
+                        const inVoteGroup = params.entitledGroupIds.intersect(user.group_ids()).length;
 
-                                return countable && inVoteGroup;
-                            });
-                        })
-                    )
-                    .subscribe(users => {
-                        this.max = users.length;
-                        this.cd.markForCheck();
-                    }),
-                this.operator.userObservable.subscribe(() => {
-                    this.cd.markForCheck();
+                        return countable && inVoteGroup;
+                    }).length;
                 })
-            );
+            )
+    });
 
-            if (this.canSeeProgressBar) {
+    public max = computed(() => {
+        return this.maxResource.hasValue() ? this.maxResource.value() : 1;
+    });
+
+    public constructor() {
+        super();
+
+        effect(() => {
+            if (this.canSeeProgressBar()) {
                 const subscriptionConfig = getParticipantVoteInfoSubscriptionConfig(this.activeMeeting.meetingId);
                 this.modelRequestBuilder.build(subscriptionConfig.modelRequest).then(modelRequest => {
                     this.autoupdate.subscribe(modelRequest, subscriptionConfig.subscriptionName);
                 });
             }
-        }
-    }
+        });
 
-    public get valueInPercent(): number {
-        return (this.votescast / this.max) * 100;
+        this.operator.userObservable.pipe(takeUntilDestroyed()).subscribe(() => {
+            this.canSeeNames.set(this.operator.hasPerms(Permission.userCanSee));
+            this.canManageSpeakers.set(this.operator.hasPerms(Permission.listOfSpeakersCanManage));
+        });
     }
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.html
new file mode 100644
index 0000000000..cc447c7040
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.html
@@ -0,0 +1,47 @@
+<div class="result-wrapper">
+    <table class="result-table">
+        <tbody>
+            <tr>
+                <th class="left-header"></th>
+                <th class="right-header" colspan="2">{{ 'Votes' | translate }}</th>
+            </tr>
+            @for (row of options(); track row.key) {
+                <tr [class]="row.votingOption">
+                    <!-- YNA/Valid etc -->
+                    <td class="label-column">
+                        @if (row.icon) {
+                            <os-icon-container size="large" [icon]="row.icon">
+                                {{ row.votingOption | pollKeyVerbose | translate }}
+                            </os-icon-container>
+                        } @else {
+                            <span>
+                                {{ row.votingOption | pollKeyVerbose | translate }}
+                            </span>
+                        }
+                    </td>
+
+                    <!-- Percent numbers -->
+                    <td class="result-cell-definition percent-column">
+                        @if (
+                            row.showPercent ||
+                            (shouldShowEntitled && poll().config?.onehundred_percent_base !== 'entitled')
+                        ) {
+                            <span>
+                                {{ row.amount! | pollPercentBase: poll() }}
+                            </span>
+                        }
+                    </td>
+
+                    <!-- Voices -->
+                    <td class="result-cell-definition">
+                        {{ row.amount | pollParseNumber }}
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
+
+<div class="doughnut-chart-normal">
+    <os-chart type="doughnut" [data]="chartData()"></os-chart>
+</div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.scss
new file mode 100644
index 0000000000..39a2d2b83d
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.scss
@@ -0,0 +1,83 @@
+@use 'src/assets/styles/poll-styles-common.scss';
+
+:host {
+    outline: none;
+}
+
+.result-wrapper-additional {
+    .result-table {
+        tr {
+            height: 40px;
+        }
+    }
+}
+
+.result-wrapper {
+    display: grid;
+    justify-items: center;
+    align-items: center;
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+    grid-gap: 0 2em;
+    font-size: 16px;
+    margin: 2em 25px;
+
+    .margins {
+        margin-left: 50px;
+    }
+
+    .result-table {
+        border-collapse: collapse;
+        height: fit-content;
+        width: 100%;
+        .right-header {
+            font-weight: initial;
+            text-align: right;
+        }
+        .left-header {
+            text-align: left;
+            font-weight: initial;
+        }
+
+        tr {
+            border-bottom: none !important;
+
+            .result-cell-definition {
+                text-align: right;
+            }
+
+            td {
+                padding: 7px 0;
+            }
+
+            :nth-child(2):not(th) {
+                padding-left: 10px;
+                padding-right: 10px;
+            }
+        }
+
+        .percent-column {
+            tr {
+                :nth-child(2):not(th) {
+                    min-width: 100px;
+                }
+            }
+        }
+
+        .votesvalid {
+            border-top: 2px solid rgba(128, 128, 128, 0.2);
+        }
+    }
+
+    .doughnut-chart-normal {
+        width: 200px;
+        margin-top: -35px;
+        align-self: start;
+    }
+
+    .doughnut-chart-slide {
+        width: 260px;
+        margin-top: 0px;
+        justify-self: right;
+        margin-right: 50px;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.ts
new file mode 100644
index 0000000000..1defb3c673
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-approval/poll-result-approval.component.ts
@@ -0,0 +1,110 @@
+import { ChangeDetectionStrategy, Component, computed, inject, input, signal } from '@angular/core';
+import { TranslatePipe } from '@ngx-translate/core';
+import { ThemeService } from 'src/app/site/services/theme.service';
+import { IconContainerComponent } from 'src/app/ui/modules/icon-container';
+
+import { ViewPoll } from '../../../../pages/polls';
+import { PollKeyVerbosePipe, PollParseNumberPipe, PollPercentBasePipe } from '../../pipes';
+import { ChartComponent, ChartData } from '../chart/chart.component';
+
+const PollChartBarThickness = 20;
+// const PERCENT_DECIMAL_PLACES = 3;
+
+type Results = ResultRow[];
+interface ResultRow {
+    key: string;
+    votingOption: string;
+    icon: string;
+    amount: number;
+    showPercent: boolean;
+}
+
+interface ResultsRaw {
+    yes: string;
+    no: string;
+    abstain?: string;
+}
+
+@Component({
+    selector: 'os-poll-result-approval',
+    imports: [
+        IconContainerComponent,
+        ChartComponent,
+        TranslatePipe,
+        PollKeyVerbosePipe,
+        PollParseNumberPipe,
+        PollPercentBasePipe
+    ],
+    templateUrl: './poll-result-approval.component.html',
+    styleUrl: './poll-result-approval.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollResultApprovalComponent {
+    public poll = input.required<ViewPoll>();
+
+    private themeService = inject(ThemeService);
+
+    public shouldShowEntitled = signal<boolean>(false);
+
+    public results = computed<ResultsRaw>(() => {
+        if (!this.poll().result) {
+            return [];
+        }
+
+        return JSON.parse(this.poll().result);
+    });
+
+    public options = computed<Results>(() => {
+        const results = this.results();
+        if (!results) {
+            return [];
+        }
+
+        const rows = [
+            {
+                key: `Y`,
+                votingOption: `yes`,
+                icon: `check_circle`,
+                amount: +results.yes || 0,
+                showPercent: false
+            },
+            {
+                key: `N`,
+                votingOption: `no`,
+                icon: `cancel`,
+                amount: +results.no || 0,
+                showPercent: false
+            }
+        ];
+
+        if (this.poll().config.allow_abstain) {
+            rows.push({
+                key: `A`,
+                votingOption: `abstain`,
+                icon: `circle`,
+                amount: +results.abstain || 0,
+                showPercent: false
+            });
+        }
+
+        return rows;
+    });
+
+    public chartData = computed<ChartData>(() => {
+        const results = this.results();
+        if (!results) {
+            return [];
+        }
+
+        return Object.keys(results).map(key => {
+            return {
+                data: [+results[key]],
+                label: key,
+                backgroundColor: this.themeService.getPollColor(key),
+                hoverBackgroundColor: this.themeService.getPollColor(key),
+                barThickness: PollChartBarThickness,
+                maxBarThickness: PollChartBarThickness
+            };
+        });
+    });
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.html
new file mode 100644
index 0000000000..a53d1f79fd
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.html
@@ -0,0 +1 @@
+<p>poll-result-selection works!</p>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.spec.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.spec.ts
new file mode 100644
index 0000000000..3e5e68571e
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PollResultSelectionComponent } from './poll-result-selection.component';
+
+describe('PollResultSelectionComponent', () => {
+    let component: PollResultSelectionComponent;
+    let fixture: ComponentFixture<PollResultSelectionComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PollResultSelectionComponent]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(PollResultSelectionComponent);
+        component = fixture.componentInstance;
+        await fixture.whenStable();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.ts
new file mode 100644
index 0000000000..018d26eae6
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result-selection/poll-result-selection.component.ts
@@ -0,0 +1,10 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+
+@Component({
+    selector: 'os-poll-result-selection',
+    imports: [],
+    templateUrl: './poll-result-selection.component.html',
+    styleUrl: './poll-result-selection.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollResultSelectionComponent {}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.html
new file mode 100644
index 0000000000..22928902a8
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.html
@@ -0,0 +1,5 @@
+@switch (configType()) {
+    @case ('poll_config_approval') {
+        <os-poll-result-approval [poll]="poll()" />
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.ts
new file mode 100644
index 0000000000..3f6ff8d264
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-result/poll-result.component.ts
@@ -0,0 +1,20 @@
+import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
+import { collectionFromFqid } from 'src/app/infrastructure/utils/transform-functions';
+
+import { ViewPoll } from '../../../../pages/polls';
+import { PollResultApprovalComponent } from '../poll-result-approval/poll-result-approval.component';
+
+@Component({
+    selector: 'os-poll-result',
+    imports: [PollResultApprovalComponent],
+    templateUrl: './poll-result.component.html',
+    styleUrl: './poll-result.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollResultComponent {
+    public poll = input.required<ViewPoll>();
+
+    public configType = computed(() => {
+        return collectionFromFqid(this.poll().config_id);
+    });
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.html
new file mode 100644
index 0000000000..905a34dd40
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.html
@@ -0,0 +1,27 @@
+<div class="vote-container">
+    @for (action of voteActions(); track action.vote) {
+        <div class="vote-button-area" role="gridcell">
+            <button
+                class="vote-button"
+                mat-raised-button
+                role="radio"
+                [ariaLabel]="action.label | translate"
+                [attr.aria-checked]="isOptionSelected(action.vote) ? 'true' : 'false'"
+                [disabled]="loading()"
+                (click)="voted.emit(action.vote)"
+            >
+                <div class="vote-button-content" [class.button-content-opaque]="!isOptionSelected(action.vote)">
+                    <os-custom-icon
+                        class="vote-button-cross"
+                        [class]="isOptionSelected(action.vote) ? action.css : ''"
+                        [customIcon]="drawnCross"
+                    ></os-custom-icon>
+                    <mat-icon class="vote-button-circle">radio_button_unchecked</mat-icon>
+                </div>
+            </button>
+            <span aria-hidden="true" class="vote-label">
+                {{ action.label | translate }}
+            </span>
+        </div>
+    }
+</div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.scss
new file mode 100644
index 0000000000..4a4aadc901
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.scss
@@ -0,0 +1,60 @@
+@use 'src/assets/styles/poll-colors.scss';
+@use 'src/assets/styles/poll-styles-common.scss';
+
+.vote-container {
+    display: flex;
+    justify-content: space-around;
+    padding: 10px 0;
+}
+
+.vote-button-area {
+    display: inline-grid;
+    justify-content: center;
+}
+
+.vote-button:hover {
+    .button-content-opaque {
+        opacity: 1;
+    }
+}
+
+.vote-button {
+    min-width: 50px;
+    height: 50px;
+    margin: auto;
+
+    .vote-button-content {
+        margin: auto;
+        display: grid;
+
+        .vote-button-circle,
+        .vote-button-cross {
+            grid-column: 1;
+            grid-row: 1;
+        }
+
+        .vote-button-circle {
+            z-index: 0;
+        }
+
+        .vote-button-cross {
+            z-index: 1;
+            height: 24px;
+            width: 24px;
+            opacity: 0;
+        }
+    }
+
+    .button-content-opaque {
+        opacity: 0.5;
+    }
+
+    .button-content-not-opaque {
+        opacity: 1 !important;
+    }
+}
+
+.vote-label {
+    padding-top: 5px;
+    text-align: center;
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.ts
new file mode 100644
index 0000000000..58eb6dd9f1
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-approval/poll-vote-approval.component.ts
@@ -0,0 +1,94 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    computed,
+    effect,
+    inject,
+    input,
+    OnDestroy,
+    output,
+    signal
+} from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { _, TranslatePipe } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
+import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
+import { CustomIconComponent } from 'src/app/ui/modules/custom-icon';
+import { CustomIcon } from 'src/app/ui/modules/custom-icon/definitions';
+
+import { ViewBallot, ViewPoll } from '../../../../pages/polls';
+import { ViewUser } from '../../../../view-models/view-user';
+
+@Component({
+    selector: 'os-poll-vote-approval',
+    templateUrl: './poll-vote-approval.component.html',
+    styleUrl: './poll-vote-approval.component.scss',
+    imports: [CustomIconComponent, TranslatePipe, MatIconModule, MatButtonModule],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollVoteApprovalComponent implements OnDestroy {
+    public readonly drawnCross = CustomIcon.DRAWN_CROSS;
+
+    public poll = input.required<ViewPoll>();
+    public user = input.required<ViewUser>();
+    public loading = input<boolean>(false);
+
+    public voted = output<unknown>();
+
+    public ballots = signal<ViewBallot[]>([]);
+    // TODO: use balllots for this user/poll
+
+    private pollRepo = inject(PollRepositoryService);
+
+    public voteActions = computed(() => {
+        const actions: any[] = [
+            {
+                vote: `yes`,
+                css: `voted-yes`,
+                label: _(`Yes`)
+            },
+            {
+                vote: `no`,
+                css: `voted-no`,
+                label: _(`No`)
+            }
+        ];
+
+        if (this.poll().config.allow_abstain) {
+            actions.push({
+                vote: `abstain`,
+                css: `voted-abstain`,
+                label: _(`Abstain`)
+            });
+        }
+
+        return actions;
+    });
+
+    public isOptionSelected(_key: string): boolean {
+        return false;
+    }
+
+    private pollBallotSubscription: Subscription;
+
+    public constructor() {
+        effect(() => {
+            if (this.pollBallotSubscription) {
+                this.pollBallotSubscription.unsubscribe();
+            }
+
+            this.pollBallotSubscription = this.pollRepo
+                .pollBallotsByUser(this.poll().id, this.user().getMeetingUser().id)
+                .subscribe(ballots => {
+                    this.ballots.set(ballots);
+                });
+        });
+    }
+
+    public ngOnDestroy(): void {
+        if (this.pollBallotSubscription) {
+            this.pollBallotSubscription.unsubscribe();
+        }
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.html
new file mode 100644
index 0000000000..63b4b359f8
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.html
@@ -0,0 +1,5 @@
+@if (option().meeting_user_id) {
+    {{ option().meeting_user_id }}
+} @else {
+    {{ option().text }}
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.spec.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.spec.ts
new file mode 100644
index 0000000000..21815d56c1
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PollVoteOptionComponent } from './poll-vote-option.component';
+
+describe('PollVoteOptionComponent', () => {
+    let component: PollVoteOptionComponent;
+    let fixture: ComponentFixture<PollVoteOptionComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PollVoteOptionComponent]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(PollVoteOptionComponent);
+        component = fixture.componentInstance;
+        await fixture.whenStable();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.ts
new file mode 100644
index 0000000000..fc7dd2443e
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-option/poll-vote-option.component.ts
@@ -0,0 +1,14 @@
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+
+import { ViewPollOption } from '../../../../pages/polls';
+
+@Component({
+    selector: 'os-poll-vote-option',
+    imports: [],
+    templateUrl: './poll-vote-option.component.html',
+    styleUrl: './poll-vote-option.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollVoteOptionComponent {
+    public option = input.required<ViewPollOption>();
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.html
new file mode 100644
index 0000000000..3b691231dd
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.html
@@ -0,0 +1,40 @@
+@for (option of options(); track option.id; let i = $index) {
+    <div class="option-row" role="row" [class.accentuated-background]="i % 2 === 1">
+        <div class="vote-option-title grid-name-area" role="rowheader">
+            <os-poll-vote-option [option]="option" />
+        </div>
+        <div class="vote-button-area" role="gridcell">
+            <button
+                class="vote-button"
+                mat-raised-button
+                role="radio"
+                [ariaLabel]="option.text"
+                [attr.aria-checked]="isSelected(option.id) ? 'true' : 'false'"
+                [disabled]="loading()"
+                (click)="toggleOption(option.id)"
+            >
+                <div class="vote-button-content" [class.button-content-opaque]="!isSelected(option.id)">
+                    <os-custom-icon
+                        class="vote-button-cross"
+                        [class.voted-yes]="isSelected(option.id)"
+                        [customIcon]="drawnCross"
+                    ></os-custom-icon>
+                    <mat-icon class="vote-button-circle">radio_button_unchecked</mat-icon>
+                </div>
+            </button>
+        </div>
+    </div>
+}
+
+@if (options().length > 0) {
+    <div class="submit-area">
+        <button
+            color="accent"
+            mat-raised-button
+            [disabled]="loading() || selectedOptionIds().size === 0"
+            (click)="submitVote()"
+        >
+            {{ 'Submit vote' | translate }}
+        </button>
+    </div>
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.scss
new file mode 100644
index 0000000000..f14a2051c6
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.scss
@@ -0,0 +1,70 @@
+@use 'src/assets/styles/poll-colors.scss';
+@use 'src/assets/styles/poll-styles-common.scss';
+
+.option-row {
+    display: grid;
+    grid-template-columns: 1fr min-content;
+    grid-gap: 10px;
+    padding: 10px;
+    margin: 0 10px;
+    align-items: center;
+
+    &.accentuated-background {
+        background: rgba(0, 0, 0, 0.04);
+    }
+}
+
+.vote-option-title {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+}
+
+.vote-button-area {
+    display: inline-grid;
+    justify-content: center;
+}
+
+.vote-button:hover {
+    .button-content-opaque {
+        opacity: 1;
+    }
+}
+
+.vote-button {
+    min-width: 50px;
+    height: 50px;
+    margin: auto;
+
+    .vote-button-content {
+        margin: auto;
+        display: grid;
+
+        .vote-button-circle,
+        .vote-button-cross {
+            grid-column: 1;
+            grid-row: 1;
+        }
+
+        .vote-button-circle {
+            z-index: 0;
+        }
+
+        .vote-button-cross {
+            z-index: 1;
+            height: 24px;
+            width: 24px;
+            opacity: 0;
+        }
+    }
+
+    .button-content-opaque {
+        opacity: 0.5;
+    }
+}
+
+.submit-area {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 10px 0;
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.spec.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.spec.ts
new file mode 100644
index 0000000000..03d5580ee6
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PollVoteSelectionComponent } from './poll-vote-selection.component';
+
+describe('PollVoteSelectionComponent', () => {
+    let component: PollVoteSelectionComponent;
+    let fixture: ComponentFixture<PollVoteSelectionComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PollVoteSelectionComponent]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(PollVoteSelectionComponent);
+        component = fixture.componentInstance;
+        await fixture.whenStable();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.ts
new file mode 100644
index 0000000000..9459c6aea3
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote-selection/poll-vote-selection.component.ts
@@ -0,0 +1,103 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    computed,
+    effect,
+    inject,
+    input,
+    OnDestroy,
+    output,
+    signal
+} from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { TranslatePipe } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
+import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
+import { CustomIconComponent } from 'src/app/ui/modules/custom-icon';
+import { CustomIcon } from 'src/app/ui/modules/custom-icon/definitions';
+
+import { ViewBallot, ViewPoll, ViewPollOption } from '../../../../pages/polls';
+import { ViewUser } from '../../../../view-models/view-user';
+import { PollVoteOptionComponent } from '../poll-vote-option/poll-vote-option.component';
+
+@Component({
+    selector: 'os-poll-vote-selection',
+    imports: [CustomIconComponent, PollVoteOptionComponent, MatIconModule, MatButtonModule, TranslatePipe],
+    templateUrl: './poll-vote-selection.component.html',
+    styleUrl: './poll-vote-selection.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollVoteSelectionComponent implements OnDestroy {
+    public readonly drawnCross = CustomIcon.DRAWN_CROSS;
+
+    public poll = input.required<ViewPoll>();
+    public user = input.required<ViewUser>();
+    public loading = input<boolean>(false);
+
+    public voted = output<unknown>();
+
+    public ballots = signal<ViewBallot[]>([]);
+    public selectedOptionIds = signal<Set<number>>(new Set());
+
+    public isSingleSelect = computed(() => {
+        const config = this.poll().config;
+        return (config?.max_options_amount ?? 1) === 1;
+    });
+
+    public options = computed<ViewPollOption[]>(() => {
+        return (this.poll().options ?? []).sort((a, b) => (a.weight ?? 0) - (b.weight ?? 0));
+    });
+
+    private pollRepo = inject(PollRepositoryService);
+    private pollBallotSubscription: Subscription;
+
+    public constructor() {
+        effect(() => {
+            if (this.pollBallotSubscription) {
+                this.pollBallotSubscription.unsubscribe();
+            }
+            this.pollBallotSubscription = this.pollRepo
+                .pollBallotsByUser(this.poll().id, this.user().getMeetingUser().id)
+                .subscribe(ballots => {
+                    this.ballots.set(ballots);
+                });
+        });
+    }
+
+    public ngOnDestroy(): void {
+        if (this.pollBallotSubscription) {
+            this.pollBallotSubscription.unsubscribe();
+        }
+    }
+
+    public isSelected(optionId: number): boolean {
+        return this.selectedOptionIds().has(optionId);
+    }
+
+    public toggleOption(optionId: number): void {
+        const selected = new Set(this.selectedOptionIds());
+        if (selected.has(optionId)) {
+            selected.delete(optionId);
+        } else {
+            if (this.isSingleSelect()) {
+                selected.clear();
+            } else {
+                const maxAmount = this.poll().config?.max_options_amount ?? 1;
+                if (selected.size >= maxAmount) {
+                    return;
+                }
+            }
+            selected.add(optionId);
+        }
+        this.selectedOptionIds.set(selected);
+    }
+
+    public submitVote(): void {
+        const selected = this.selectedOptionIds();
+        if (selected.size === 0) {
+            return;
+        }
+        this.voted.emit([...selected]);
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.html
new file mode 100644
index 0000000000..1c3632ff2a
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.html
@@ -0,0 +1,54 @@
+<div [class.poll-vote-delegation]="isDelegation()">
+    @if (isDelegation()) {
+        <h4 class="poll-delegation-title">
+            <span>{{ 'Voting right for' | translate }}</span>
+            <span>&nbsp;{{ user().getFullName() }}</span>
+        </h4>
+    }
+
+    @if (loading() || (voteProhibited.hasValue() && voteProhibited.value())) {
+        <os-poll-cannot-vote-message
+            [isDeliveringVote]="loading()"
+            [poll]="poll()"
+            [reason]="voteProhibited.value()"
+            [user]="user()"
+        />
+    } @else {
+        @switch (configType()) {
+            @case ('poll_config_approval') {
+                <os-poll-vote-approval
+                    [loading]="loading()"
+                    [poll]="poll()"
+                    [user]="user()"
+                    (voted)="sendVote($event)"
+                />
+            }
+            @case ('poll_config_rating_approval') {
+                <!-- TODO: Use correct vote component -->
+                <os-poll-vote-selection
+                    [loading]="loading()"
+                    [poll]="poll()"
+                    [user]="user()"
+                    (voted)="sendVote($event)"
+                />
+            }
+            @case ('poll_config_rating_score') {
+                <!-- TODO: Use correct vote component -->
+                <os-poll-vote-selection
+                    [loading]="loading()"
+                    [poll]="poll()"
+                    [user]="user()"
+                    (voted)="sendVote($event)"
+                />
+            }
+            @case ('poll_config_selection') {
+                <os-poll-vote-selection
+                    [loading]="loading()"
+                    [poll]="poll()"
+                    [user]="user()"
+                    (voted)="sendVote($event)"
+                />
+            }
+        }
+    }
+</div>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.scss
new file mode 100644
index 0000000000..71f7841a7e
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.scss
@@ -0,0 +1,7 @@
+.poll-vote-delegation {
+    margin-top: 1em;
+
+    .poll-delegation-title {
+        font-weight: 500;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.ts
new file mode 100644
index 0000000000..b842fa6498
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-vote/poll-vote.component.ts
@@ -0,0 +1,50 @@
+import { ChangeDetectionStrategy, Component, computed, inject, input, signal } from '@angular/core';
+import { rxResource } from '@angular/core/rxjs-interop';
+import { TranslatePipe } from '@ngx-translate/core';
+import { VoteApiService } from 'src/app/gateways/vote-api.service';
+import { collectionFromFqid } from 'src/app/infrastructure/utils/transform-functions';
+import { OperatorService } from 'src/app/site/services/operator.service';
+
+import { ViewPoll } from '../../../../pages/polls';
+import { ViewUser } from '../../../../view-models/view-user';
+import { VotingService } from '../../services/voting.service';
+import { PollCannotVoteMessageComponent } from '../poll-cannot-vote-message/poll-cannot-vote-message.component';
+import { PollVoteApprovalComponent } from '../poll-vote-approval/poll-vote-approval.component';
+import { PollVoteSelectionComponent } from '../poll-vote-selection/poll-vote-selection.component';
+
+@Component({
+    selector: 'os-poll-vote',
+    imports: [PollVoteApprovalComponent, PollVoteSelectionComponent, PollCannotVoteMessageComponent, TranslatePipe],
+    templateUrl: './poll-vote.component.html',
+    styleUrl: './poll-vote.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollVoteComponent {
+    public poll = input.required<ViewPoll>();
+    public user = input.required<ViewUser>();
+
+    public loading = signal(false);
+
+    public configType = computed(() => {
+        return this.poll().config_id ? collectionFromFqid(this.poll().config_id) : null;
+    });
+
+    private operator = inject(OperatorService);
+    private voteApi = inject(VoteApiService);
+    private votingService = inject(VotingService);
+
+    public voteProhibited = rxResource({
+        params: () => ({ poll: this.poll(), user: this.user() }),
+        stream: ({ params }) => this.votingService.votingProhibited(params.poll, params.user)
+    });
+
+    public isDelegation = computed(() => {
+        return this.user().id !== this.operator.user.id;
+    });
+
+    public async sendVote(value: unknown): Promise<void> {
+        this.loading.set(true);
+        await this.voteApi.vote(this.poll().id, value, this.user().getMeetingUser().id);
+        this.loading.set(false);
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.html b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.html
new file mode 100644
index 0000000000..f9afe90775
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.html
@@ -0,0 +1,156 @@
+<!-- Poll Infos -->
+<div class="poll-title-wrapper">
+    <!-- Title Area -->
+    <div class="poll-title-area">
+        <!-- Title -->
+        <span class="poll-title break-word">
+            @if (isSameMeeting() && getDetailLink()) {
+                <a [routerLink]="getDetailLink()">
+                    {{ poll().title | translate }}
+                </a>
+            } @else {
+                {{ poll().title | translate }}
+            }
+        </span>
+
+        <!-- Subtitle -->
+        <div class="italic spacer-bottom-20">
+            <!-- Type and State -->
+            <div class="type-and-state italic spacer-bottom-20 break-word">
+                <span *osPerms="permission.motionCanManagePolls; and: poll().isEVoting">
+                    <os-icon-container
+                        class="poll-type break-word"
+                        color="primary"
+                        icon="info"
+                        size="large"
+                        [showIcon]="poll().isAnonymous"
+                        [swap]="true"
+                        (iconAction)="openVotingWarning()"
+                    >
+                        {{ poll().visibility | translateKey: 'poll_visibility' }}
+                    </os-icon-container>
+                    @if (poll().isAnonymous) {
+                        <span>&nbsp;</span>
+                    }
+                    &middot;&nbsp;
+                </span>
+                <!-- State -->
+                <span class="break-word">
+                    @if (poll().isEVoting && poll().canBeVotedFor()) {
+                        {{ 'Voting in progress' | translate }}
+                    } @else {
+                        {{ poll().state | translateKey: 'poll_state' }}
+                    }
+                </span>
+            </div>
+        </div>
+    </div>
+
+    <!-- Dot Menu -->
+    <span *osPerms="permission.motionCanManagePolls; and: isSameMeeting()" class="poll-actions">
+        <button mat-icon-button [matMenuTriggerFor]="pollDetailMenu">
+            <mat-icon class="icon-18">more_horiz</mat-icon>
+        </button>
+    </span>
+</div>
+
+<!-- Change state button -->
+<div *osPerms="permission.motionCanManagePolls; and: !hideChangeState()">
+    @if (pollStateAction()) {
+        <button
+            mat-stroked-button
+            [class]="pollStateAction().css"
+            [disabled]="stateChangePending()"
+            (click)="nextPollState()"
+        >
+            <mat-icon>{{ pollStateAction().icon }}</mat-icon>
+            <span class="next-state-label">
+                @if (stateChangePending()) {
+                    {{ 'In progress, please wait ...' | translate }}
+                } @else {
+                    {{ poll().nextState | translateKey: 'poll_state_change_action' }}
+                }
+            </span>
+        </button>
+    }
+</div>
+
+@if (!poll().stateHasVotes && poll().visibility !== 'manually') {
+    @if (poll().isStarted) {
+        <os-poll-progress [poll]="poll()" />
+    }
+}
+
+@if (poll().canBeVotedFor()) {
+    @if (poll() && user()) {
+        <!-- own voting -->
+        @if (!user().isInActiveMeeting) {
+            <div class="text-center">
+                {{ 'You are not part of the meeting' | translate }}
+            </div>
+        } @else if (user().isPresentInMeeting()) {
+            <os-poll-vote [poll]="poll()" [user]="user()"></os-poll-vote>
+        } @else {
+            <div class="text-center">
+                {{ 'You have to be present to vote.' | translate }}
+            </div>
+        }
+
+        <!-- Delegations -->
+        @if (user().isPresentInMeeting() && voteDelegationEnabled()) {
+            @for (delegation of delegations(); track delegation.id) {
+                <div class="poll-vote-delegation">
+                    <mat-divider></mat-divider>
+                    <os-poll-vote [poll]="poll()" [user]="delegation"></os-poll-vote>
+                </div>
+            }
+        }
+    }
+} @else if (poll().isFinished) {
+    <os-poll-result [poll]="poll()" />
+}
+
+@if (!poll().isFinished) {
+    <os-poll-meta [poll]="poll()" />
+}
+
+<!-- More Menu -->
+<mat-menu #pollDetailMenu="matMenu">
+    <button *osPerms="permission.motionCanManagePolls" mat-menu-item (click)="dialogOpened.emit()">
+        <mat-icon>edit</mat-icon>
+        <span>{{ 'Edit' | translate }}</span>
+    </button>
+    <os-projector-button
+        *osPerms="permission.projectorCanManage"
+        [allowReferenceProjector]="true"
+        [menuItem]="true"
+        [object]="poll().getProjectionBuildDescriptor()"
+    />
+    <button
+        *osPerms="permission.motionCanManagePolls; and: poll && poll().canAnonymize"
+        mat-menu-item
+        (click)="anonymizePoll()"
+    >
+        <mat-icon>warning</mat-icon>
+        <span>{{ 'Anonymize votes' | translate }}</span>
+    </button>
+    <button mat-menu-item (click)="downloadPdf.emit()">
+        <mat-icon>picture_as_pdf</mat-icon>
+        <span>{{ 'Ballot papers' | translate }}</span>
+    </button>
+    <div *osPerms="permission.motionCanManagePolls">
+        <mat-divider></mat-divider>
+
+        <!-- Reset Button -->
+        <button mat-menu-item (click)="resetState()">
+            <mat-icon color="warn">replay</mat-icon>
+            <span>{{ 'Reset state' | translate }}</span>
+        </button>
+
+        <!-- Delete button -->
+        <button mat-menu-item (click)="deletePoll()">
+            <mat-icon color="warn">delete</mat-icon>
+            <span>{{ 'Delete' | translate }}</span>
+        </button>
+    </div>
+</mat-menu>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.scss
new file mode 100644
index 0000000000..7c35c9e6c3
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.scss
@@ -0,0 +1,31 @@
+@use 'src/assets/styles/poll-styles-common.scss';
+
+.poll-title-wrapper {
+    display: grid;
+    grid-gap: 10px;
+    grid-template-areas: 'title actions';
+    grid-template-columns: auto min-content;
+
+    .poll-title-area {
+        grid-area: title;
+
+        .poll-title {
+            font-size: 125%;
+            font-weight: 500;
+        }
+    }
+
+    .type-and-state {
+        display: flex;
+        span {
+            display: flex;
+        }
+        .poll-type {
+            width: fit-content;
+        }
+    }
+
+    .poll-actions {
+        grid-area: actions;
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.ts
new file mode 100644
index 0000000000..66fda3163a
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/components/poll/poll.component.ts
@@ -0,0 +1,171 @@
+import { ChangeDetectionStrategy, Component, computed, inject, input, output, Signal, signal } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialog } from '@angular/material/dialog';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatIconModule } from '@angular/material/icon';
+import { MatMenuModule } from '@angular/material/menu';
+import { RouterLink } from '@angular/router';
+import { TranslatePipe } from '@ngx-translate/core';
+import { PollState, PollVisibility } from 'src/app/domain/models/poll';
+import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
+import { OperatorService } from 'src/app/site/services/operator.service';
+import { DirectivesModule } from 'src/app/ui/directives';
+import { ChoiceService } from 'src/app/ui/modules/choice-dialog';
+import { IconContainerComponent } from 'src/app/ui/modules/icon-container';
+import { PromptService } from 'src/app/ui/modules/prompt-dialog';
+import { TranslateKeyPipe } from 'src/app/ui/pipes/translate-key/translate-key.pipe';
+
+import { BaseMeetingComponent } from '../../../../base/base-meeting.component';
+import { ViewPoll } from '../../../../pages/polls';
+import { ProjectorButtonModule } from '../../../meetings-component-collector/projector-button/projector-button.module';
+import { PollControllerService } from '../../services/poll-controller.service';
+import { PollMetaComponent } from '../poll-meta/poll-meta.component';
+import { PollProgressComponent } from '../poll-progress/poll-progress.component';
+import { PollResultComponent } from '../poll-result/poll-result.component';
+import { PollVoteComponent } from '../poll-vote/poll-vote.component';
+import { VotingPrivacyWarningDialogComponent } from '../voting-privacy-warning/voting-privacy-warning-dialog.component';
+
+interface PollStateAction {
+    icon: string;
+    css: string;
+}
+
+@Component({
+    selector: 'os-poll',
+    imports: [
+        PollVoteComponent,
+        PollProgressComponent,
+        PollResultComponent,
+        PollMetaComponent,
+        IconContainerComponent,
+        ProjectorButtonModule,
+        TranslatePipe,
+        TranslateKeyPipe,
+        DirectivesModule,
+        RouterLink,
+        MatButtonModule,
+        MatIconModule,
+        MatMenuModule,
+        MatDividerModule
+    ],
+    templateUrl: './poll.component.html',
+    styleUrl: './poll.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class PollComponent extends BaseMeetingComponent {
+    public poll = input.required<ViewPoll>();
+
+    public dialogOpened = output<void>();
+    public downloadPdf = output<void>();
+
+    public stateChangePending = signal(false);
+
+    public isSameMeeting = computed(() => {
+        return this.poll().meeting_id === this.currentMeetingId();
+    });
+
+    public pollStateAction: Signal<PollStateAction | null> = computed(() => {
+        return this.pollStateActions[this.poll().state] ?? null;
+    });
+
+    public hideChangeState: Signal<boolean> = computed(() => {
+        return this.poll().isPublished || (this.poll().isCreated && this.poll().visibility === PollVisibility.Manually);
+    });
+
+    public getDetailLink(): string {
+        // TODO: Implement
+        return ``;
+    }
+
+    private pollStateActions: Record<PollState, PollStateAction> = {
+        [PollState.Created]: {
+            icon: `play_arrow`,
+            css: `start-poll-button`
+        },
+        [PollState.Started]: {
+            icon: `stop`,
+            css: `stop-poll-button`
+        },
+        [PollState.Finished]: {
+            icon: `public`,
+            css: `publish-poll-button`
+        }
+    };
+
+    private operator = inject(OperatorService);
+    private promptService = inject(PromptService);
+    private choiceService = inject(ChoiceService);
+    private repo = inject(PollControllerService);
+    private dialog = inject(MatDialog);
+
+    public user = toSignal(this.operator.userObservable);
+    public currentMeetingId = toSignal(this.activeMeetingIdService.meetingIdObservable);
+    public voteDelegationEnabled = toSignal(this.meetingSettingsService.get(`users_enable_vote_delegations`));
+
+    public delegations = computed(() => {
+        return this.user().vote_delegations_from();
+    });
+
+    public openVotingWarning(): void {
+        this.dialog.open(VotingPrivacyWarningDialogComponent, infoDialogSettings);
+    }
+
+    public async anonymizePoll(): Promise<void> {
+        const title = this.translate.instant(`Are you sure you want to anonymize all votes? This cannot be undone.`);
+        if (await this.promptService.open(title)) {
+            this.repo.anonymize(this.poll()).catch(this.raiseError);
+        }
+    }
+
+    public async resetState(): Promise<void> {
+        const title = this.translate.instant(`Are you sure you want to reset this vote?`);
+        const content = this.translate.instant(`All votes will be lost.`);
+        if (await this.promptService.open(title, content)) {
+            this.changeState(PollState.Created);
+        }
+    }
+
+    public async deletePoll(): Promise<void> {
+        const title = this.translate.instant(`Are you sure you want to delete this vote?`);
+        const content = this.poll().getTitle();
+        if (await this.promptService.open(title, content)) {
+            await this.repo.delete(this.poll());
+        }
+    }
+
+    public async nextPollState(): Promise<void> {
+        const currentState: PollState = this.poll().state;
+        if (currentState === PollState.Created || currentState === PollState.Finished) {
+            if (this.poll().nextState !== `published`) {
+                await this.changeState(this.poll().nextState as PollState);
+            } else {
+                this.repo.publish(this.poll());
+            }
+        } else if (currentState === PollState.Started) {
+            const title = this.translate.instant(`Are you sure you want to stop this voting?`);
+            const STOP_LABEL = this.translate.instant(`Stop`);
+            const STOP_PUBLISH_LABEL = this.translate.instant(`Stop & publish`);
+            const STOP_PUBLISH_ANONYMIZE_LABEL = this.translate.instant(`Stop, publish & anonymize`);
+            const actions = [STOP_LABEL, STOP_PUBLISH_LABEL];
+            if (this.poll().live_voting_enabled) {
+                actions.push(STOP_PUBLISH_ANONYMIZE_LABEL);
+            }
+            const choice = await this.choiceService.open({ title, multiSelect: false, actions });
+
+            if (choice?.action === STOP_LABEL) {
+                await this.changeState(PollState.Finished);
+            } else if (choice?.action === STOP_PUBLISH_LABEL) {
+                await this.repo.publish(this.poll()).catch(this.raiseError);
+            } else if (choice?.action === STOP_PUBLISH_ANONYMIZE_LABEL) {
+                await this.repo.anonymize(this.poll(), true).catch(this.raiseError);
+            }
+        }
+    }
+
+    private async changeState(targetState: PollState): Promise<void> {
+        this.stateChangePending.set(true);
+        await this.repo.changePollState(this.poll(), targetState).catch(this.raiseError);
+        this.stateChangePending.set(false);
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.html b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.html
index b019f10440..018953a07d 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.html
@@ -1,18 +1,16 @@
 @if (poll) {
     <div
-        [ngClass]="{
-            'result-wrapper': true,
-            'result-wrapper-additional': iconSize !== 'medium',
-            'extra-grid-normal': !inSlide,
-            'extra-grid-slide': inSlide
-        }"
+        class="result-wrapper"
+        [class.extra-grid-normal]="!inSlide"
+        [class.extra-grid-slide]="inSlide"
+        [class.result-wrapper-additional]="iconSize !== 'medium'"
     >
-        <table class="result-table" [ngClass]="{ margins: iconSize === 'gigantic' }">
+        <table class="result-table" [class.margins]="iconSize === 'gigantic'">
             <tbody
+                [class]="textSizeClass"
                 [class.column-padding-width-slide]="inSlide"
                 [class.percent-column-width-gigantic]="!inSlide && iconSize === 'gigantic'"
                 [class.percent-column-width-large]="!inSlide && iconSize === 'large'"
-                [ngClass]="textSizeClass"
             >
                 @if (shouldShowHead && !inSlide) {
                     <tr>
@@ -26,7 +24,7 @@
                 }
                 @for (row of tableData; track row; let i = $index) {
                     @if (['user', 'list'].includes(row.class)) {
-                        <tr [class.slide]="inSlide" [class.text-big-bold]="inSlide" [ngClass]="row.votingOption">
+                        <tr [class]="row.votingOption" [class.slide]="inSlide" [class.text-big-bold]="inSlide">
                             <td class="label-column">
                                 @if (row.value[0].icon) {
                                     <os-icon-container [icon]="row.value[0].icon" [size]="iconSize">
@@ -65,7 +63,7 @@
                         </tr>
                     }
                     @if (!['user', 'list'].includes(row.class)) {
-                        <tr [class.slide]="inSlide" [class.text-big-bold]="inSlide" [ngClass]="row.votingOption">
+                        <tr [class]="row.votingOption" [class.slide]="inSlide" [class.text-big-bold]="inSlide">
                             <!-- YNA/Valid etc -->
                             <td class="label-column">
                                 @if (row.value[0].icon) {
@@ -87,7 +85,7 @@
                                 } @else {
                                     @if (
                                         row.value[0].showPercent ||
-                                        (shouldShowEntitled && poll.onehundred_percent_base !== 'entitled')
+                                        (shouldShowEntitled && poll.config?.onehundred_percent_base !== 'entitled')
                                     ) {
                                         <span>
                                             {{ row.value[0].amount! | pollPercentBase: poll }}
@@ -100,7 +98,7 @@
                                 @if (inSlide) {
                                     @if (
                                         row.value[0].showPercent ||
-                                        (shouldShowEntitled && poll.onehundred_percent_base !== 'entitled')
+                                        (shouldShowEntitled && poll.config?.onehundred_percent_base !== 'entitled')
                                     ) {
                                         <span>
                                             {{ row.value[0].amount! | pollPercentBaseAlt: poll }}
@@ -117,7 +115,7 @@
                     <tr class="entitled-users-row">
                         <td>{{ 'Entitled users' | translate }}</td>
                         <td class="result-cell-definition">
-                            @if (poll.onehundred_percent_base === 'entitled') {
+                            @if (poll.config?.onehundred_percent_base === 'entitled') {
                                 {{ poll.entitled_users_at_stop.length | pollPercentBase: poll }}
                             }
                         </td>
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts
index 5a31facf53..0539d8104a 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts
@@ -1,18 +1,28 @@
-import { ChangeDetectorRef, Component, Input } from '@angular/core';
-import { PollData, PollMethod, PollTableData, VotingResult } from 'src/app/domain/models/poll';
-import { ThemeService } from 'src/app/site/services/theme.service';
+import { Component, Input } from '@angular/core';
+import { PollTableData } from 'src/app/domain/models/poll';
 
+import { ViewPoll } from '../../../../pages/polls';
 import { PollService } from '../../services/poll.service';
 import { ChartData } from '../chart/chart.component';
 
 @Component({
     selector: `os-single-option-chart-table`,
-    templateUrl: `./single-option-chart-table.component.html`,
-    styleUrls: [`./single-option-chart-table.component.scss`],
-    standalone: false
+    template: ``,
+    styleUrls: [`./single-option-chart-table.component.scss`]
+    /*
+    imports: [
+        TranslatePipe,
+        IconContainerComponent,
+        ChartComponent,
+        PollKeyVerbosePipe,
+        PollParseNumberPipe,
+        PollPercentBasePipe,
+        PollPercentBaseAltPipe
+    ]
+    */
 })
 export class SingleOptionChartTableComponent {
-    private _poll: PollData;
+    private _poll: ViewPoll;
 
     private _tableData: PollTableData[] = [];
     private _chartData: ChartData = null;
@@ -29,8 +39,8 @@ export class SingleOptionChartTableComponent {
     public set tableData(tableData: PollTableData[]) {
         this._tableData = tableData;
         if (this._poll) {
-            this.setChartData();
-            this.cd.markForCheck();
+            // this.setChartData();
+            // this.cd.markForCheck();
         }
     }
 
@@ -41,29 +51,25 @@ export class SingleOptionChartTableComponent {
     @Input()
     public set pollService(pollService: PollService) {
         this._pollService = pollService;
-        this.setChartData();
-        this.cd.markForCheck();
+        // this.setChartData();
+        // this.cd.markForCheck();
     }
 
     public get pollService(): PollService {
-        return this._pollService || this.defaultPollService;
+        return this._pollService;
     }
 
     @Input()
-    public set poll(pollData: PollData) {
+    public set poll(pollData: ViewPoll) {
         this._poll = pollData;
-        this.setChartData();
-        this.cd.markForCheck();
+        // this.setChartData();
+        // this.cd.markForCheck();
     }
 
-    public get poll(): PollData {
+    public get poll(): ViewPoll {
         return this._poll;
     }
 
-    private get method(): string | null {
-        return this.poll?.pollmethod || null;
-    }
-
     @Input()
     public iconSize: `medium` | `large` | `gigantic` = `large`;
 
@@ -80,6 +86,7 @@ export class SingleOptionChartTableComponent {
         return this._chartData;
     }
 
+    /*
     public get isMethodY(): boolean {
         return this.method === PollMethod.Y;
     }
@@ -168,4 +175,5 @@ export class SingleOptionChartTableComponent {
             return amount;
         }
     }
+    */
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.html b/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.html
index b4417f4825..13f767e49b 100644
--- a/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.html
+++ b/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.html
@@ -3,7 +3,7 @@
         <div>
             <os-list
                 [filterProps]="filterProps"
-                [filterService]="parent.poll.type === 'named' ? filter : null"
+                [filterService]="parent.poll.isNamed ? filter : null"
                 [fullScreen]="false"
                 [listObservable]="votesDataObservable"
             >
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.html b/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.html
similarity index 100%
rename from client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.html
rename to client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.html
diff --git a/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.scss b/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.spec.ts b/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.spec.ts
similarity index 100%
rename from client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.spec.ts
rename to client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.spec.ts
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.ts
similarity index 55%
rename from client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts
rename to client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.ts
index 50d335138f..cae858882e 100644
--- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/components/voting-privacy-warning/voting-privacy-warning-dialog.component.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { TranslatePipe } from '@ngx-translate/core';
 
 @Component({
     selector: `os-voting-privacy-warning-dialog`,
     templateUrl: `./voting-privacy-warning-dialog.component.html`,
     styleUrls: [`./voting-privacy-warning-dialog.component.scss`],
-    standalone: false
+    imports: [MatButtonModule, MatDialogModule, TranslatePipe]
 })
 export class VotingPrivacyWarningDialogComponent {}
diff --git a/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts b/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts
index d82d27c594..409128f866 100644
--- a/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts
@@ -1,16 +1,10 @@
-import { Fqid } from 'src/app/domain/definitions/key-types';
+import { HasMeetingId } from 'src/app/domain/interfaces';
 import { BaseModel } from 'src/app/domain/models/base/base-model';
-import { Poll } from 'src/app/domain/models/poll/poll';
 
 export interface PollDialogData {
-    // Required
     title: string;
-    type: string;
-    pollmethod: string;
-    content_object_id?: Fqid;
-    content_object: BaseModel;
-    poll?: Poll;
+    content_object: BaseModel & HasMeetingId;
 
-    isPublished?: boolean;
-    onehundred_percent_base?: string;
+    entitled_group_ids: number[];
+    live_voting_enabled: boolean;
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/index.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/index.ts
deleted file mode 100644
index 05140fa02d..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './voting-privacy-dialog.module';
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts
deleted file mode 100644
index 98c92412bd..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { VotingPrivacyWarningDialogService } from './voting-privacy-warning-dialog.service';
-
-xdescribe(`VotingPrivacyWarningDialogService`, () => {
-    let service: VotingPrivacyWarningDialogService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({});
-        service = TestBed.inject(VotingPrivacyWarningDialogService);
-    });
-
-    it(`should be created`, () => {
-        expect(service).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts
deleted file mode 100644
index cdea3bde0a..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings';
-import { BaseDialogService } from 'src/app/ui/base/base-dialog-service';
-
-import { VotingPrivacyWarningDialogComponent } from '../components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component';
-import { VotingPrivacyDialogModule } from '../voting-privacy-dialog.module';
-
-@Injectable({
-    providedIn: VotingPrivacyDialogModule
-})
-export class VotingPrivacyWarningDialogService extends BaseDialogService<
-    VotingPrivacyWarningDialogComponent,
-    void,
-    null
-> {
-    public async open(): Promise<MatDialogRef<VotingPrivacyWarningDialogComponent, null>> {
-        const module = await import(`../voting-privacy-dialog.module`).then(m => m.VotingPrivacyDialogModule);
-        return this.dialog.open(module.getComponent(), infoDialogSettings);
-    }
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts
deleted file mode 100644
index d9fb48f7d6..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { MatDialogModule } from '@angular/material/dialog';
-import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations';
-
-import { VotingPrivacyWarningDialogComponent } from './components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component';
-
-@NgModule({
-    declarations: [VotingPrivacyWarningDialogComponent],
-    imports: [CommonModule, MatDialogModule, OpenSlidesTranslationModule.forChild()]
-})
-export class VotingPrivacyDialogModule {
-    public static getComponent(): typeof VotingPrivacyWarningDialogComponent {
-        return VotingPrivacyWarningDialogComponent;
-    }
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts
index c0f17142f7..552d3a0836 100644
--- a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts
@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 import {
     OptionData,
     PollClassType,
-    PollData,
     PollMethod,
     PollPercentBase,
     PollState,
@@ -60,6 +59,7 @@ const testPollData: Record<string, PollData> = {
         pollClassType: PollClassType.Assignment,
         pollmethod: PollMethod.YN,
         state: PollState.Created,
+        published: false,
         onehundred_percent_base: PollPercentBase.Entitled,
         votesvalid: 1,
         votesinvalid: 2,
@@ -79,6 +79,7 @@ const testPollData: Record<string, PollData> = {
         pollClassType: PollClassType.Topic,
         pollmethod: PollMethod.Y,
         state: PollState.Finished,
+        published: false,
         onehundred_percent_base: PollPercentBase.Y,
         votesvalid: 40,
         votesinvalid: 2,
@@ -97,7 +98,8 @@ const testPollData: Record<string, PollData> = {
     motionPoll: {
         pollClassType: PollClassType.Motion,
         pollmethod: PollMethod.YNA,
-        state: PollState.Published,
+        state: PollState.Finished,
+        published: true,
         onehundred_percent_base: PollPercentBase.Y,
         votesvalid: 5,
         votesinvalid: 6,
@@ -134,13 +136,13 @@ describe(`PollPercentBasePipe`, () => {
         const poll = testPollData[`assignmentPoll`];
         const options = poll.options;
         expect(pipe.transform(0, poll, options[0])).toBe(
-            `(assignment: 0, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "{}")`
+            `(assignment: 0, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","published":false,"onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "{}")`
         );
         expect(pipe.transform(2, poll, options[1])).toBe(
-            `(assignment: 2, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "{}")`
+            `(assignment: 2, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","published":false,"onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "{}")`
         );
         expect(pipe.transform(5, poll, options[6])).toBe(
-            `(assignment: 5, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "undefined")`
+            `(assignment: 5, "{"pollClassType":"assignment","pollmethod":"YN","state":"created","published":false,"onehundred_percent_base":"entitled","votesvalid":1,"votesinvalid":2,"votescast":3,"type":"named","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{},"global_option":{}}", "undefined")`
         );
     });
 
@@ -152,13 +154,13 @@ describe(`PollPercentBasePipe`, () => {
             { votingOption: `Mice`, value: [] }
         ];
         expect(pipe.transform(0, poll, options[0])).toBe(
-            `(topic: 0, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "{"votingOption":"Humans","value":[]}")`
+            `(topic: 0, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","published":false,"onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "{"votingOption":"Humans","value":[]}")`
         );
         expect(pipe.transform(2, poll, options[1])).toBe(
-            `(topic: 2, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "{"votingOption":"Dolphins","value":[]}")`
+            `(topic: 2, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","published":false,"onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "{"votingOption":"Dolphins","value":[]}")`
         );
         expect(pipe.transform(5, poll, options[6])).toBe(
-            `(topic: 5, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "undefined")`
+            `(topic: 5, "{"pollClassType":"topic","pollmethod":"Y","state":"finished","published":false,"onehundred_percent_base":"Y","votesvalid":40,"votesinvalid":2,"votescast":42,"type":"pseudoanonymous","entitled_users_at_stop":[],"options":[{},{},{}],"options$":{}}", "undefined")`
         );
     });
 
@@ -166,13 +168,13 @@ describe(`PollPercentBasePipe`, () => {
         const poll = testPollData[`motionPoll`];
         const options = poll.options;
         expect(pipe.transform(0, poll, options[0])).toBe(
-            `(default: 0, "{"pollClassType":"motion","pollmethod":"YNA","state":"published","onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "{}")`
+            `(default: 0, "{"pollClassType":"motion","pollmethod":"YNA","state":"finished","published":true,"onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "{}")`
         );
         expect(pipe.transform(2, poll, options[1])).toBe(
-            `(default: 2, "{"pollClassType":"motion","pollmethod":"YNA","state":"published","onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "undefined")`
+            `(default: 2, "{"pollClassType":"motion","pollmethod":"YNA","state":"finished","published":true,"onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "undefined")`
         );
         expect(pipe.transform(5, poll, options[6])).toBe(
-            `(default: 5, "{"pollClassType":"motion","pollmethod":"YNA","state":"published","onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "undefined")`
+            `(default: 5, "{"pollClassType":"motion","pollmethod":"YNA","state":"finished","published":true,"onehundred_percent_base":"Y","votesvalid":5,"votesinvalid":6,"votescast":11,"type":"analog","entitled_users_at_stop":[],"options":[{}],"options$":{}}", "undefined")`
         );
     });
 
diff --git a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts
index b7003d1513..ac789ed97c 100644
--- a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts
@@ -1,9 +1,9 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { OptionData, PollData } from 'src/app/domain/models/poll/generic-poll';
+import { OptionData } from 'src/app/domain/models/poll/generic-poll';
 import { PollTableData } from 'src/app/domain/models/poll/poll-constants';
 
+import { ViewPoll } from '../../../../pages/polls';
 import { PollService } from '../../services/poll.service/poll.service';
-import { PollServiceMapperService } from '../../services/poll-service-mapper.service/poll-service-mapper.service';
 
 /**
  * Uses a number and a ViewPoll-object.
@@ -22,12 +22,9 @@ import { PollServiceMapperService } from '../../services/poll-service-mapper.ser
     name: `pollPercentBase`
 })
 export class PollPercentBasePipe implements PipeTransform {
-    public constructor(
-        private pollService: PollService,
-        private pollServiceMapperService: PollServiceMapperService
-    ) {}
+    public constructor(private pollService: PollService) {}
 
-    public transform(value: number, poll: PollData, row?: OptionData | PollTableData): string | null {
+    public transform(value: number, poll: ViewPoll, row?: OptionData | PollTableData): string | null {
         // logic handles over the pollService to avoid circular dependencies
         const voteValueInPercent: string = this.getVoteValueInPercent(value, poll, row);
 
@@ -38,11 +35,7 @@ export class PollPercentBasePipe implements PipeTransform {
         }
     }
 
-    protected getVoteValueInPercent(value: number, poll: PollData, row?: OptionData | PollTableData): string {
-        const service = this.pollServiceMapperService.getService(poll.pollClassType);
-        if (service) {
-            return service.getVoteValueInPercent(value, { poll, row });
-        }
+    protected getVoteValueInPercent(value: number, poll: ViewPoll, row?: OptionData | PollTableData): string {
         return this.pollService.getVoteValueInPercent(value, { poll, row });
     }
 }
@@ -51,7 +44,7 @@ export class PollPercentBasePipe implements PipeTransform {
     name: `pollPercentBaseAlt`
 })
 export class PollPercentBaseAltPipe extends PollPercentBasePipe implements PipeTransform {
-    public override transform(value: number, poll: PollData, row?: OptionData | PollTableData): string | null {
+    public override transform(value: number, poll: ViewPoll, row?: OptionData | PollTableData): string | null {
         // logic handles over the pollService to avoid circular dependencies
         const voteValueInPercent: string = this.getVoteValueInPercent(value, poll, row);
 
diff --git a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts
index 13048db5a2..ddf9e17ae8 100644
--- a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts
@@ -25,20 +25,16 @@ import { PollFilteredVotesChartComponent } from './components/poll-filtered-vote
 import { PollProgressComponent } from './components/poll-progress/poll-progress.component';
 import { SingleOptionChartTableComponent } from './components/single-option-chart-table/single-option-chart-table.component';
 import { VotesTableComponent } from './components/votes-table/votes-table.component';
-import { VotingPrivacyDialogModule } from './modules/voting-privacy-dialog';
 import { PollKeyVerbosePipe, PollParseNumberPipe, PollPercentBaseAltPipe, PollPercentBasePipe } from './pipes';
 import { PollServiceModule } from './services/poll-service.module';
 
-const MODULES = [PollServiceModule, VotingPrivacyDialogModule];
+const MODULES = [PollServiceModule];
 const PIPES = [PollKeyVerbosePipe, PollPercentBasePipe, PollPercentBaseAltPipe, PollParseNumberPipe];
 const COMPONENTS = [
-    PollProgressComponent,
     PollFilteredVotesChartComponent,
     CheckInputComponent,
     EntitledUsersTableComponent,
-    SingleOptionChartTableComponent,
-    VotesTableComponent,
-    PollCannotVoteMessageComponent
+    VotesTableComponent
 ];
 
 @NgModule({
@@ -46,6 +42,9 @@ const COMPONENTS = [
     imports: [
         CommonModule,
         ChartComponent,
+        PollCannotVoteMessageComponent,
+        PollProgressComponent,
+        SingleOptionChartTableComponent,
         MatProgressBarModule,
         MatFormFieldModule,
         MatSelectModule,
@@ -58,7 +57,6 @@ const COMPONENTS = [
         MatTooltipModule,
         IconContainerComponent,
         FormsModule,
-        VotingPrivacyDialogModule,
         ListModule,
         DirectivesModule,
         SearchSelectorModule,
@@ -66,7 +64,15 @@ const COMPONENTS = [
         ...PIPES,
         OpenSlidesTranslationModule.forChild()
     ],
-    exports: [...PIPES, ...MODULES, ...COMPONENTS, ChartComponent],
+    exports: [
+        ...PIPES,
+        ...MODULES,
+        ...COMPONENTS,
+        SingleOptionChartTableComponent,
+        ChartComponent,
+        PollCannotVoteMessageComponent,
+        PollProgressComponent
+    ],
     providers: [...PIPES]
 })
 export class PollModule {}
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts
index 9069725258..092d9fe431 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@angular/core';
-import { distinctUntilChanged, map, Observable } from 'rxjs';
+import { map, Observable } from 'rxjs';
 import { Fqid } from 'src/app/domain/definitions/key-types';
-import { Identifiable } from 'src/app/domain/interfaces';
+import { HasMeetingId, Identifiable } from 'src/app/domain/interfaces';
+import { BaseModel } from 'src/app/domain/models/base/base-model';
 import { Poll } from 'src/app/domain/models/poll/poll';
 import { PollState } from 'src/app/domain/models/poll/poll-constants';
+import { BallotRepositoryService } from 'src/app/gateways/repositories/polls/ballot-repository.service';
 import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
-import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service';
-import { viewModelListEqual } from 'src/app/infrastructure/utils';
+import { PollCreatePayload, PollUpdatePayload } from 'src/app/gateways/vote-api.service';
 import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service';
 import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service';
 
@@ -17,30 +18,31 @@ export class PollControllerService extends BaseMeetingControllerService<ViewPoll
     public constructor(
         controllerServiceCollector: MeetingControllerServiceCollectorService,
         protected override repo: PollRepositoryService,
-        protected voteRepo: VoteRepositoryService
+        protected voteRepo: BallotRepositoryService
     ) {
         super(controllerServiceCollector, Poll, repo);
+    }
 
-        this.getViewModelListObservableOfStarted()
-            .pipe(
-                distinctUntilChanged((l1, l2) => viewModelListEqual(l1, l2, false)),
-                map(value => value.map(p => p.id))
-            )
-            .subscribe(startedPolls => {
-                this.voteRepo.updateStartedPolls(startedPolls);
-            });
+    public getViewModelListObservableOfStarted(): Observable<ViewPoll[]> {
+        return this.getViewModelListObservable().pipe(map(polls => polls.filter(p => p.isStarted)));
     }
 
-    public create(payload: any): Promise<Identifiable> {
-        return this.repo.create(payload);
+    public getViewModelListByContentObject(fqid: Fqid): ViewPoll[] {
+        return this.getViewModelList().filter(poll => poll.content_object_id === fqid);
+    }
+
+    public create(contentObject: BaseModel<any> & HasMeetingId, payload: PollUpdatePayload): Promise<Identifiable> {
+        const createPayload: PollCreatePayload = {
+            ...payload,
+            content_object_id: contentObject.fqid,
+            meeting_id: contentObject.meeting_id
+        };
+
+        return this.repo.create(createPayload);
     }
 
-    public update(payload: any, poll: ViewPoll): Promise<void> {
-        const optionUpdatePayload = poll.options.map((option, index) => ({
-            id: option.id,
-            ...payload.options[index]
-        }));
-        return this.repo.update(payload, poll, optionUpdatePayload);
+    public update(poll: ViewPoll, payload: PollUpdatePayload): Promise<void> {
+        return this.repo.update(poll, payload);
     }
 
     public delete(poll: Identifiable): Promise<void> {
@@ -51,19 +53,11 @@ export class PollControllerService extends BaseMeetingControllerService<ViewPoll
         return this.repo.changePollState(poll, targetState);
     }
 
-    public vote(poll: Identifiable, options: any): Promise<void> {
-        return this.repo.vote(poll, options);
-    }
-
-    public getViewModelListObservableOfStarted(): Observable<ViewPoll[]> {
-        return this.getViewModelListObservable().pipe(map(polls => polls.filter(p => p.isStarted)));
-    }
-
-    public getViewModelListByContentObject(fqid: Fqid): ViewPoll[] {
-        return this.getViewModelList().filter(_poll => _poll.content_object_id === fqid);
+    public anonymize(poll: Identifiable, publish?: boolean): Promise<void> {
+        return this.repo.anonymize(poll, publish);
     }
 
-    public anonymize(poll: Identifiable, updateState?: PollState): Promise<void> {
-        return this.repo.anonymize(poll, updateState);
+    public publish(poll: Identifiable): Promise<void> {
+        return this.repo.publishPoll(poll);
     }
 }
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts
index f3481684ac..3ee4880fd5 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts
@@ -1,35 +1,26 @@
 import { inject, Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { OptionData, PollData } from 'src/app/domain/models/poll/generic-poll';
-import { OptionDataKey } from 'src/app/domain/models/poll/generic-poll';
+import { OptionData } from 'src/app/domain/models/poll/generic-poll';
+import { BaseOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-types';
 import {
     ABSTAIN_KEY,
     CalculablePollKey,
     isPollTableData,
     NO_KEY,
-    PollMethod,
-    PollPercentBase,
-    PollPercentBaseVerbose,
-    PollPercentBaseVerboseKey,
-    PollPropertyVerbose,
-    PollPropertyVerboseKey,
     PollTableData,
-    PollType,
-    PollTypeVerbose,
-    PollTypeVerboseKey,
     PollValues,
     VOTE_MAJORITY,
     VOTE_UNDOCUMENTED,
     VotingResult,
     YES_KEY
 } from 'src/app/domain/models/poll/poll-constants';
-import { compareNumber } from 'src/app/infrastructure/utils';
 import { ChartData, ChartDate } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component';
 import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service';
 import { ThemeService } from 'src/app/site/services/theme.service';
 
-import { isSortedList } from '../../../../pages/polls/view-models/sorted-list';
+import { ViewPoll } from '../../../../pages/polls';
 import { ActiveMeetingService } from '../../../../services/active-meeting.service';
+import { MeetingSettingsService } from '../../../../services/meeting-settings.service';
 import { PollServiceModule } from '../poll-service.module';
 
 const PollChartBarThickness = 20;
@@ -40,6 +31,12 @@ export abstract class PollService {
     protected sortByVote = false;
     protected enableMaxVotesPerOption = false;
 
+    public get defaultPollLiveVotingEnabled(): boolean {
+        return this._defaultPollLiveVotingEnabled;
+    }
+
+    private _defaultPollLiveVotingEnabled = false;
+
     public get isElectronicVotingEnabled(): boolean {
         return this._isElectronicVotingEnabled;
     }
@@ -47,6 +44,7 @@ export abstract class PollService {
     private _isElectronicVotingEnabled = false;
 
     private organizationSettingsService = inject(OrganizationSettingsService);
+    protected meetingSettingsService = inject(MeetingSettingsService);
     protected translate = inject(TranslateService);
     protected themeService = inject(ThemeService);
     protected activeMeeting = inject(ActiveMeetingService);
@@ -55,9 +53,15 @@ export abstract class PollService {
         this.organizationSettingsService
             .get(`enable_electronic_voting`)
             .subscribe(is => (this._isElectronicVotingEnabled = is));
+
+        this.meetingSettingsService
+            .get(`poll_default_live_voting_enabled`)
+            .subscribe(is => (this._defaultPollLiveVotingEnabled = is));
     }
 
-    public generateTableData(poll: PollData): PollTableData[] {
+    public generateTableData(_poll: ViewPoll): PollTableData[] {
+        return [];
+        /*
         const tableData: PollTableData[] = poll.options
             .sort((a, b) => {
                 if (this.sortByVote) {
@@ -118,9 +122,10 @@ export abstract class PollService {
         tableData.push(...this.formatVotingResultToTableData(this.getSumTableKeys(poll), poll));
 
         return tableData;
+        */
     }
 
-    public getChartLabels(poll: PollData, excludeYNALabels = false): string[] {
+    public getChartLabels(poll: ViewPoll, excludeYNALabels = false): string[] {
         const fields = this.getPollDataFields(poll);
         return poll.options.map(option => {
             const votingResults = fields.map(field => {
@@ -173,8 +178,13 @@ export abstract class PollService {
         }
     }
 
-    private getGlobalVoteKeys(poll: PollData): VotingResult[] {
+    public shouldShowChart(_poll: ViewPoll): boolean {
+        return false;
+    }
+
+    private getGlobalVoteKeys(_poll: ViewPoll): VotingResult[] {
         return [
+            /*
             {
                 vote: `amount_global_yes`,
                 showPercent: this.showPercentOfValidOrCast(poll),
@@ -196,10 +206,11 @@ export abstract class PollService {
                 amount: poll.global_option?.abstain,
                 hide: poll.global_option?.abstain === VOTE_UNDOCUMENTED || !poll.global_abstain
             }
+            */
         ];
     }
 
-    private formatVotingResultToTableData(resultList: VotingResult[], poll: PollData): PollTableData[] {
+    private formatVotingResultToTableData(resultList: VotingResult[], poll: ViewPoll): PollTableData[] {
         return resultList
             .filter(key => !key.hide)
             .map(
@@ -209,7 +220,7 @@ export abstract class PollService {
                         class: `sums`,
                         value: [
                             {
-                                amount: key.amount ?? poll[key.vote! as keyof PollData],
+                                amount: key.amount ?? poll[key.vote! as keyof ViewPoll],
                                 hide: key.hide,
                                 showPercent: key.showPercent
                             } as VotingResult
@@ -221,9 +232,10 @@ export abstract class PollService {
     /**
      * returns the total number of votes depending on the selected percent base
      */
-    protected getPercentBase(poll: PollData, row?: OptionData): number {
-        const base: PollPercentBase = poll.onehundred_percent_base as PollPercentBase;
-        let totalByBase = 0;
+    protected getPercentBase(_poll: ViewPoll, _row?: OptionData): number {
+        /* TODO: Reenable
+        const base: PollPercentBase = poll.config?.onehundred_percent_base as PollPercentBase;
+        const totalByBase = 0;
         const option = row ?? poll.options[0]; // Assuming a motion poll and the first option contains every vote
         switch (base) {
             case PollPercentBase.YN:
@@ -251,6 +263,8 @@ export abstract class PollService {
                 break;
         }
         return totalByBase;
+                */
+        return 1;
     }
 
     private sumOptionsYN(option: OptionData): number {
@@ -266,7 +280,7 @@ export abstract class PollService {
 
     public getVoteValueInPercent(
         value: number,
-        { poll, row }: { poll: PollData; row?: OptionData | PollTableData }
+        { poll, row }: { poll: ViewPoll; row?: OptionData | PollTableData }
     ): string {
         const option: OptionData | undefined = isPollTableData(row) ? this.transformToOptionData(row) : row;
         const totalByBase = this.getPercentBase(poll, option);
@@ -279,28 +293,7 @@ export abstract class PollService {
         return ``;
     }
 
-    /**
-     * @deprecated Please rewrite this function
-     *
-     * @param key
-     * @param value
-     * @returns
-     */
-    public getVerboseNameForValue(key: string, value: PollPercentBaseVerboseKey | PollTypeVerboseKey): string {
-        switch (key) {
-            case `onehundred_percent_base`:
-                return PollPercentBaseVerbose[value as PollPercentBaseVerboseKey];
-            case `type`:
-                return PollTypeVerbose[value as PollTypeVerboseKey];
-        }
-        return ``;
-    }
-
-    public getVerboseNameForKey(key: PollPropertyVerboseKey): string {
-        return PollPropertyVerbose[key];
-    }
-
-    public getVoteTableKeys(poll: PollData): VotingResult[] {
+    public getVoteTableKeys(poll: ViewPoll): VotingResult[] {
         const keys: VotingResult[] = [
             {
                 vote: YES_KEY,
@@ -314,7 +307,7 @@ export abstract class PollService {
             }
         ];
 
-        if (poll.pollmethod !== PollMethod.YN) {
+        if (poll.config?.allow_abstain) {
             keys.push({
                 vote: ABSTAIN_KEY,
                 icon: `circle`,
@@ -325,24 +318,22 @@ export abstract class PollService {
         return keys;
     }
 
-    private showAbstainPercent(poll: PollData): boolean {
+    private showAbstainPercent(poll: ViewPoll): boolean {
+        const base: BaseOnehundredPercentBase = poll.config?.onehundred_percent_base;
         return (
-            poll.onehundred_percent_base === PollPercentBase.YNA ||
-            poll.onehundred_percent_base === PollPercentBase.Valid ||
-            poll.onehundred_percent_base === PollPercentBase.Cast
+            // TODO: YNA replacement
+            base === `valid` || base === `cast`
         );
     }
 
-    public showPercentOfValidOrCast(poll: PollData): boolean {
-        return (
-            poll.onehundred_percent_base === PollPercentBase.Valid ||
-            poll.onehundred_percent_base === PollPercentBase.Cast ||
-            poll.onehundred_percent_base === PollPercentBase.Entitled ||
-            poll.onehundred_percent_base === PollPercentBase.EntitledPresent
-        );
+    public showPercentOfValidOrCast(poll: ViewPoll): boolean {
+        const base: BaseOnehundredPercentBase = poll.config?.onehundred_percent_base;
+        return base === `valid` || base === `cast` || base === `entitled` || base === `entitled_present`;
     }
 
-    public getSumTableKeys(poll: PollData): VotingResult[] {
+    public getSumTableKeys(_poll: ViewPoll): VotingResult[] {
+        return [];
+        /*
         return [
             {
                 vote: `votesvalid`,
@@ -352,19 +343,20 @@ export abstract class PollService {
             {
                 vote: `votesinvalid`,
                 hide: poll.votesinvalid === VOTE_UNDOCUMENTED || poll.type !== PollType.Analog,
-                showPercent: poll.onehundred_percent_base === PollPercentBase.Cast
+                showPercent: poll.config?.onehundred_percent_base === PollPercentBase.Cast
             },
             {
                 vote: `votescast`,
                 hide: poll.votescast === VOTE_UNDOCUMENTED || poll.type !== PollType.Analog,
-                showPercent: poll.onehundred_percent_base === PollPercentBase.Cast
+                showPercent: poll.config?.onehundred_percent_base === PollPercentBase.Cast
             }
         ];
+        */
     }
 
-    public generateChartData(poll: PollData): ChartData {
+    public generateChartData(poll: ViewPoll): ChartData {
         let fields = this.getPollDataFields(poll);
-        if (poll?.onehundred_percent_base === PollPercentBase.YN || poll?.pollmethod === PollMethod.YN) {
+        if (poll.config?.onehundred_percent_base === `yes_no` || !poll.config?.allow_abstain) {
             fields = fields.filter(key => key === YES_KEY || key === NO_KEY);
         }
 
@@ -388,11 +380,12 @@ export abstract class PollService {
     /**
      * Extracts yes-no-abstain such as valid, invalids and totals from Poll and PollData-Objects
      */
-    protected getResultFromPoll(poll: PollData, key: CalculablePollKey): (number | undefined)[] {
-        return (poll ? [...poll.options, poll.global_option] : []).map(option => (option ? option[key] : undefined));
+    protected getResultFromPoll(_poll: ViewPoll, _key: CalculablePollKey): (number | undefined)[] {
+        // return (poll ? [...poll.options, poll.global_option] : []).map(option => (option ? option[key] : undefined));
+        return [];
     }
 
-    protected getPollDataFields(_poll: PollData): CalculablePollKey[] {
+    protected getPollDataFields(_poll: ViewPoll): CalculablePollKey[] {
         throw new Error(`Method not implemented`);
     }
 
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.spec.ts
similarity index 59%
rename from client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts
rename to client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.spec.ts
index e384c037d8..0a1bab6dc5 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.spec.ts
@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { VoteControllerService } from './vote-controller.service';
+import { BallotControllerService } from './ballot-controller.service';
 
 xdescribe(`VoteControllerService`, () => {
-    let service: VoteControllerService;
+    let service: BallotControllerService;
 
     beforeEach(() => {
         TestBed.configureTestingModule({});
-        service = TestBed.inject(VoteControllerService);
+        service = TestBed.inject(BallotControllerService);
     });
 
     it(`should be created`, () => {
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.ts
new file mode 100644
index 0000000000..17685e031d
--- /dev/null
+++ b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/ballot-controller.service.ts
@@ -0,0 +1,41 @@
+import { inject, Injectable } from '@angular/core';
+import { combineLatest, map, Observable } from 'rxjs';
+import { Id } from 'src/app/domain/definitions/key-types';
+import { Ballot } from 'src/app/domain/models/poll/ballot';
+import { BallotRepositoryService } from 'src/app/gateways/repositories/polls/ballot-repository.service';
+import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
+import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service';
+import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service';
+import { OperatorService } from 'src/app/site/services/operator.service';
+
+import { ViewBallot, ViewPoll } from '../../../../pages/polls';
+
+@Injectable({
+    providedIn: `root`
+})
+export class BallotControllerService extends BaseMeetingControllerService<ViewBallot, Ballot> {
+    private pollRepo = inject(PollRepositoryService);
+
+    public constructor(
+        controllerServiceCollector: MeetingControllerServiceCollectorService,
+        protected override repo: BallotRepositoryService,
+        private operator: OperatorService
+    ) {
+        super(controllerServiceCollector, Ballot, repo);
+    }
+
+    public subscribeVoted(...viewPolls: ViewPoll[]): Observable<Record<Id, boolean>> {
+        const userIds = [this.operator.user.id, ...(this.operator.user.vote_delegations_from_ids() || [])];
+        return combineLatest(
+            viewPolls.map(poll => {
+                return combineLatest(userIds.map(userId => this.pollRepo.pollBallotsByUser(poll.id, userId))).pipe(
+                    map(ballots => !!ballots.map(b => !!b.length).some(b => b))
+                );
+            })
+        ).pipe(
+            map(voted => {
+                return Object.fromEntries(viewPolls.map((p, i) => [p.id, voted[i]]));
+            })
+        );
+    }
+}
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/index.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/index.ts
index 4effe90c00..6003e0c6e2 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/index.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/index.ts
@@ -1 +1 @@
-export * from './vote-controller.service';
+export * from './ballot-controller.service';
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts
deleted file mode 100644
index 78cb14942c..0000000000
--- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Id } from 'src/app/domain/definitions/key-types';
-import { Vote } from 'src/app/domain/models/poll/vote';
-import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service';
-import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service';
-import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service';
-import { OperatorService } from 'src/app/site/services/operator.service';
-
-import { ViewPoll, ViewVote } from '../../../../pages/polls';
-
-@Injectable({
-    providedIn: `root`
-})
-export class VoteControllerService extends BaseMeetingControllerService<ViewVote, Vote> {
-    public constructor(
-        controllerServiceCollector: MeetingControllerServiceCollectorService,
-        protected override repo: VoteRepositoryService,
-        private operator: OperatorService
-    ) {
-        super(controllerServiceCollector, Vote, repo);
-    }
-
-    public subscribeVoted(...viewPolls: ViewPoll[]): Observable<Record<Id, Id[]>> {
-        return new Observable<Record<Id, Id[]>>(subscriber => {
-            const current = {};
-            for (const poll of viewPolls) {
-                const subscription =
-                    !this.operator.isAnonymousLoggedIn && this.operator.user
-                        ? this.repo.subscribeVoted(poll, [
-                              this.operator.user.id,
-                              ...(this.operator.user.vote_delegations_from_ids() || [])
-                          ])
-                        : null;
-
-                if (!subscription) {
-                    continue;
-                }
-
-                if (subscription.value !== undefined) {
-                    current[poll.id] = subscription.value;
-                }
-
-                subscription.subscribe({
-                    next: async (voted: Id[] | null | undefined) => {
-                        if (voted !== undefined) {
-                            await this.setHasVotedOnPoll(poll, voted);
-
-                            current[poll.id] = voted;
-                            subscriber.next(current);
-                        }
-                    },
-                    complete: () => {
-                        subscriber.complete();
-                    }
-                });
-            }
-
-            subscriber.next(current);
-        });
-    }
-
-    public async setHasVotedOnPoll(poll: ViewPoll, voteResp: Id[]): Promise<void> {
-        await this.operator.ready;
-        poll.hasVoted = voteResp?.some(id => id === this.operator.operatorId) ?? false;
-        poll.user_has_voted_for_delegations = voteResp?.filter(id => id !== this.operator.operatorId) ?? [];
-    }
-}
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts
index d19a148ec9..d17a770918 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts
@@ -4,7 +4,7 @@ import { ActiveFiltersService } from 'src/app/site/services/active-filters.servi
 
 import { GroupControllerService } from '../../../pages/participants';
 import { StructureLevelControllerService } from '../../../pages/participants/pages/structure-levels/services/structure-level-controller.service';
-import { ViewVote } from '../../../pages/polls';
+import { ViewBallot } from '../../../pages/polls';
 import { PollServiceModule } from '../services/poll-service.module';
 
 @Injectable({
@@ -13,13 +13,13 @@ import { PollServiceModule } from '../services/poll-service.module';
 export class VotesFilterService extends BaseFilterListService<any> {
     protected storageKey = `VotesEntry`;
 
-    private groupFilterOptions: OsFilter<ViewVote> = {
+    private groupFilterOptions: OsFilter<ViewBallot> = {
         property: `groupIds`,
         label: `Groups`,
         options: []
     };
 
-    private structureLevelFilterOptions: OsFilter<ViewVote> = {
+    private structureLevelFilterOptions: OsFilter<ViewBallot> = {
         property: `structureLevelIds`,
         label: `Structure level`,
         options: []
diff --git a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts
index b894002f2c..29809cb5b1 100644
--- a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts
+++ b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts
@@ -1,9 +1,12 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { _ } from '@ngx-translate/core';
-import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
+import { combineLatest, map, Observable } from 'rxjs';
+import { PollState } from 'src/app/domain/models/poll/poll-constants';
+import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
+import { ViewBallot, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 import { OperatorService } from 'src/app/site/services/operator.service';
+import { UserControllerService } from 'src/app/site/services/user-controller.service';
 
 import { ActiveMeetingService } from '../../../../services/active-meeting.service';
 import { MeetingSettingsService } from '../../../../services/meeting-settings.service';
@@ -40,6 +43,9 @@ export class VotingService {
     private _voteDelegationEnabled = false;
     private _forbidDelegationToVote = false;
 
+    private userRepo = inject(UserControllerService);
+    private pollRepo = inject(PollRepositoryService);
+
     public constructor(
         private activeMeetingService: ActiveMeetingService,
         private operator: OperatorService,
@@ -54,11 +60,76 @@ export class VotingService {
             .subscribe(enabled => (this._forbidDelegationToVote = enabled));
     }
 
+    /**
+     * checks whether the operator can vote on the given poll
+     */
+    public hasVoted(poll: ViewPoll, user?: ViewUser): Observable<boolean> {
+        return this.pollRepo.pollBallotsByUser(poll.id, user.id).pipe(map(ballots => !!ballots.length));
+    }
+
+    /**
+     * checks whether the operator can vote on the given poll
+     */
+    public votingProhibited(poll: ViewPoll, user?: ViewUser): Observable<VotingProhibition | null> {
+        return combineLatest([
+            this.userRepo.getViewModelObservable(user.id),
+            this.pollRepo.getViewModelObservable(poll.id),
+            this.pollRepo.pollBallotsByUser(poll.id, user.id)
+        ]).pipe(
+            map(([user, poll, ballots]) => {
+                return this.getVotingProhibitionReason(poll, user, ballots);
+            })
+        );
+        // return this.userRepo.getViewModelObservable(user.id).pipe(map(u => !this.getVotingProhibitionReason(poll, u)));
+    }
+
+    private getVotingProhibitionReason(
+        poll: ViewPoll,
+        user: ViewUser,
+        ballots: ViewBallot[]
+    ): VotingProhibition | null {
+        if (this.operator.isAnonymous) {
+            return VotingProhibition.USER_IS_ANONYMOUS;
+        }
+
+        if (ballots.length) {
+            return VotingProhibition.USER_HAS_VOTED;
+        }
+
+        if (this._currentUser?.id === user?.id) {
+            if (user?.isVoteRightDelegated && this._voteDelegationEnabled && this._forbidDelegationToVote) {
+                return VotingProhibition.USER_HAS_DELEGATED_RIGHT;
+            }
+        }
+
+        if (
+            !(poll.entitled_group_ids || []).some(id =>
+                user.group_ids(this.activeMeetingService.meetingId).includes(id)
+            )
+        ) {
+            return VotingProhibition.USER_HAS_NO_PERMISSION;
+        }
+
+        if (poll.isAnalog) {
+            return VotingProhibition.POLL_WRONG_TYPE;
+        }
+
+        if (poll.state !== PollState.Started) {
+            return VotingProhibition.POLL_WRONG_STATE;
+        }
+
+        if (!user?.isPresentInMeeting() && !this._currentUser?.canVoteFor(user)) {
+            return VotingProhibition.USER_NOT_PRESENT;
+        }
+
+        return null;
+    }
+
     /**
      * checks whether the operator can vote on the given poll
      */
     public canVote(poll: ViewPoll, user?: ViewUser): boolean {
-        const error = this.getVotingProhibitionReason(poll, user);
+        const error = this.getVotingProhibitionReasonLegacy(poll, user);
         return !error;
     }
 
@@ -66,7 +137,7 @@ export class VotingService {
      * checks whether the operator can vote on the given poll
      * @returns null if no errors exist (= user can vote) or else a VotingProhibition reason
      */
-    private getVotingProhibitionReason(
+    private getVotingProhibitionReasonLegacy(
         poll: ViewPoll,
         user: ViewUser | null = this._currentUser
     ): VotingProhibition | void {
@@ -78,7 +149,8 @@ export class VotingService {
                 return VotingProhibition.USER_HAS_VOTED;
             }
         }
-        if (this._currentUser?.id !== user?.id && poll.hasVotedForDelegations(user?.id)) {
+        // TODO: Check if voted for delegation && poll.hasVotedForDelegations(user?.id)
+        if (this._currentUser?.id !== user?.id) {
             return VotingProhibition.USER_HAS_VOTED;
         }
         if (this.operator.isAnonymous) {
@@ -91,7 +163,7 @@ export class VotingService {
         ) {
             return VotingProhibition.USER_HAS_NO_PERMISSION;
         }
-        if (poll.type === PollType.Analog) {
+        if (poll.isAnalog) {
             return VotingProhibition.POLL_WRONG_TYPE;
         }
         if (poll.state !== PollState.Started) {
@@ -103,13 +175,13 @@ export class VotingService {
     }
 
     public getVotingProhibitionReasonVerbose(poll: ViewPoll, user: ViewUser | null = this._currentUser): string | void {
-        const reason = this.getVotingProhibitionReason(poll, user);
+        const reason = this.getVotingProhibitionReasonLegacy(poll, user);
         if (reason) {
             return VotingProhibitionVerbose[reason];
         }
     }
 
-    public getVotingProhibitionReasonVerboseFromName(reasonName: string): string {
-        return VotingProhibitionVerbose[VotingProhibition[reasonName]] ?? _(`There is an unknown voting problem.`);
+    public getVotingProhibitionReasonVerboseFromName(reason: VotingProhibition): string {
+        return VotingProhibitionVerbose[reason] ?? _(`There is an unknown voting problem.`);
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts
index f000353faa..dfa007e45b 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts
@@ -1,7 +1,8 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core';
 import { Permission } from 'src/app/domain/definitions/permission';
-import { pollChartColors, PollData, PollState, PollTableData } from 'src/app/domain/models/poll';
+import { pollChartColors, PollState, PollTableData } from 'src/app/domain/models/poll';
 import { ChartData } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component';
+import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
@@ -10,13 +11,15 @@ import { TopicPollService } from '../../services/topic-poll.service';
 const SUBSCRIPTION_NAME = `tableData`;
 @Component({
     selector: `os-topic-poll-detail-content`,
-    templateUrl: `./topic-poll-detail-content.component.html`,
+    template: `
+        TODO
+    `,
     styleUrls: [`./topic-poll-detail-content.component.scss`],
     changeDetection: ChangeDetectionStrategy.OnPush,
     standalone: false
 })
 export class TopicPollDetailContentComponent extends BaseUiComponent {
-    private _poll: PollData;
+    private _poll: ViewPoll;
 
     private _tableData: PollTableData[] = [];
     private _chartData: ChartData = null;
@@ -39,13 +42,13 @@ export class TopicPollDetailContentComponent extends BaseUiComponent {
     }
 
     @Input()
-    public set poll(pollData: PollData) {
+    public set poll(pollData: ViewPoll) {
         this._poll = pollData;
         this.setupTableData();
         this.cd.markForCheck();
     }
 
-    public get poll(): PollData {
+    public get poll(): ViewPoll {
         return this._poll;
     }
 
@@ -65,7 +68,7 @@ export class TopicPollDetailContentComponent extends BaseUiComponent {
     }
 
     public get isPublished(): boolean {
-        return this.state === PollState.Published;
+        return this.isFinished && this.poll?.published;
     }
 
     public get canSeeResults(): boolean {
@@ -73,7 +76,8 @@ export class TopicPollDetailContentComponent extends BaseUiComponent {
     }
 
     public get shouldShowChart(): boolean {
-        return this.pollService.shouldShowChart(this.poll);
+        // return this.pollService.shouldShowChart(this.poll);
+        return false;
     }
 
     public get chartColors(): [{ backgroundColor: string[] }] {
@@ -89,6 +93,7 @@ export class TopicPollDetailContentComponent extends BaseUiComponent {
     }
 
     private setupTableData(): void {
+        /* TODO: Update
         this.updateSubscription(
             SUBSCRIPTION_NAME,
             this.pollService.generateTableDataAsObservable(this.poll).subscribe(tableData => {
@@ -97,6 +102,7 @@ export class TopicPollDetailContentComponent extends BaseUiComponent {
                 this.cd.markForCheck();
             })
         );
+        */
     }
 
     private setChartData(): void {
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
index a8016df541..b6f95268de 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.html
@@ -1,92 +1,15 @@
 <mat-dialog-content>
-    <!-- Settings -->
-    <os-topic-poll-form
-        #pollForm
-        [data]="pollData"
-        [percentBases]="PollPercentBaseVerbose"
-        [pollClassType]="pollClassType.Topic"
-        [pollMethods]="PollMethodVerbose"
-        [pollService]="topicPollService"
-        [pollTypes]="PollTypes"
-    />
-
-    <!-- Options -->
-    @if (!isEdit) {
-        <div class="option-selection topic-poll-preview-meta-info-form info-grid">
-            <ng-container>
-                <h3>{{ 'Options' | translate }}</h3>
-                <div>
-                    <div #scrollframe class="option-list" (scroll)="scrolled($event)">
-                        @if (newOptions.length) {
-                            <os-sorting-list
-                                [input]="optionsSubject"
-                                [live]="true"
-                                (sortEvent)="onSortingChange($event)"
-                            >
-                                <!-- implicit item references into the component using ng-template slot -->
-                                <ng-template let-item>
-                                    <div #item class="single-option-line">
-                                        <span>{{ item.getTitle() }}</span>
-                                        <span class="delete-button">
-                                            <button
-                                                mat-icon-button
-                                                matTooltip="{{ 'Remove option' | translate }}"
-                                                (click)="removeOption(item)"
-                                            >
-                                                <mat-icon>clear</mat-icon>
-                                            </button>
-                                        </span>
-                                    </div>
-                                </ng-template>
-                            </os-sorting-list>
-                        }
-                    </div>
-                    <div>
-                        <!-- Enter new option -->
-                        <div>
-                            <mat-form-field>
-                                <mat-label>{{ 'New option' | translate }}</mat-label>
-                                <input matInput require type="text" [(ngModel)]="optionInput" />
-                                <mat-error>{{ 'This field is required.' | translate }}</mat-error>
-                            </mat-form-field>
-                        </div>
-                        <!-- Add option -->
-                        <div>
-                            <div>
-                                <button
-                                    color="accent"
-                                    mat-button
-                                    [disabled]="optionInput === ''"
-                                    (click)="addNewOption()"
-                                >
-                                    <mat-icon>add</mat-icon>
-                                    <span>{{ 'Add option' | translate }}</span>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </ng-container>
-            <!-- Too few options warning -->
-            <div class="potential-warning">
-                @if (!hasEnoughOptions()) {
-                    <i class="foreground-warn">
-                        {{ optionsWarning | translate }}
-                    </i>
-                }
-            </div>
-        </div>
-    }
+    <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled" [optionEdit]="true">
+        <os-poll-form-selection optionType="text" [data]="pollData" />
+    </os-poll-form>
 </mat-dialog-content>
 
 <!-- Actions -->
 <mat-dialog-actions>
     <!-- Save Button -->
-    @if (pollForm && dialogVoteForm && pollForm.contentForm) {
-        <button mat-button [disabled]="!formsValid || (!hasEnoughOptions() && !isEdit)" (click)="submitPoll()">
-            <span>{{ 'Save' | translate }}</span>
-        </button>
-    }
+    <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
+        <span>{{ 'Save' | translate }}</span>
+    </button>
 
     <!-- Cancel Button -->
     <button mat-button [mat-dialog-close]="false">
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
index 2a55e984c7..7484579810 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts
@@ -1,241 +1,51 @@
-import { AfterViewInit, Component, ElementRef, Inject, QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { Validators } from '@angular/forms';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { _ } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { Selectable } from 'src/app/domain/interfaces';
-import {
-    GeneralValueVerbose,
-    LOWEST_VOTE_VALUE,
-    PollMethod,
-    PollPercentBaseVerbose,
-    PollPropertyVerbose,
-    PollTypeVerbose,
-    VoteValue
-} from 'src/app/domain/models/poll';
+import { Component, inject, viewChild } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { TranslatePipe } from '@ngx-translate/core';
+import { PollVisibility } from 'src/app/domain/models/poll';
+import { PollUpdatePayload } from 'src/app/gateways/vote-api.service';
 import { BasePollDialogComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
-
-import { ViewTopic } from '../../../../view-models';
-import { TopicPollMethodVerbose } from '../../definitions';
-import { TopicPollService } from '../../services/topic-poll.service';
-
-let uniqueId = 0;
-export class TextOptionSelectable implements Selectable {
-    public readonly id = ++uniqueId;
-
-    public constructor(private readonly text: string) {}
-
-    public getTitle(): string {
-        return this.text;
-    }
-
-    public getListTitle(): string {
-        return `Options`;
-    }
-}
+import { PollFormComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component';
+import { PollFormSelectionComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component';
+import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
 
 @Component({
     selector: `os-topic-poll-dialog`,
     templateUrl: `./topic-poll-dialog.component.html`,
     styleUrls: [`./topic-poll-dialog.component.scss`],
-    standalone: false
+    imports: [PollFormComponent, PollFormSelectionComponent, MatDialogModule, MatButtonModule, TranslatePipe]
 })
-export class TopicPollDialogComponent extends BasePollDialogComponent implements AfterViewInit {
-    @ViewChild(`scrollframe`, { static: false }) public scrollFrame: ElementRef;
-    @ViewChildren(`item`) public itemElements: QueryList<any>;
-
-    private scrollContainer: any;
-    private isNearBottom = true;
-
-    /**
-     * List of accepted special non-numerical values.
-     * See {@link PollService.specialPollVotes}
-     */
-    public specialValues: [number, string][];
-
-    public generalValueVerbose = GeneralValueVerbose;
-    public PollPropertyVerbose = PollPropertyVerbose;
-
-    public PollMethodVerbose = TopicPollMethodVerbose;
-    public PollPercentBaseVerbose = PollPercentBaseVerbose;
-    public PollTypes = PollTypeVerbose;
-
-    private minNumberOfOptions = 2;
-    public optionsWarning = _(`There should be at least 2 options.`);
-
-    public newOptions: TextOptionSelectable[] = [];
-    public optionsSubject = new BehaviorSubject<TextOptionSelectable[]>(this.newOptions);
-    public optionInput = ``;
-
-    public readonly globalValues = [`global_yes`, `global_no`, `global_abstain`];
+export class TopicPollDialogComponent extends BasePollDialogComponent {
+    public majority: string;
 
-    public get isEdit(): boolean {
-        const viewPoll = this.pollData as Partial<ViewPoll>;
-        return !!viewPoll.state; // no state means, its under creation
-    }
-
-    public override get formsValid(): boolean {
-        this.submitOptionData();
-        return super.formsValid;
-    }
-
-    public constructor(
-        public topicPollService: TopicPollService,
-        @Inject(MAT_DIALOG_DATA) pollData: ViewPoll<ViewTopic>
-    ) {
-        super(pollData);
-        this.optionTypeText = true;
-    }
-
-    public ngAfterViewInit(): void {
-        if (this.scrollFrame) {
-            this.scrollContainer = this.scrollFrame.nativeElement;
-            this.itemElements.changes.subscribe(_ => this.onItemElementsChanged());
-        }
-    }
+    private selectionPollForm = viewChild.required(PollFormSelectionComponent);
 
-    public override onBeforeInit(): void {
-        this.subscriptions.push(
-            this.pollForm.contentForm.valueChanges.pipe(debounceTime(150), distinctUntilChanged()).subscribe(() => {
-                this.triggerUpdate();
-            })
-        );
+    public get isEVotingEnabled(): boolean {
+        return this.pollService.isElectronicVotingEnabled;
     }
 
-    protected getAnalogVoteFields(): VoteValue[] {
-        const pollmethod = this.pollForm.contentForm.get(`pollmethod`).value;
+    private pollService = inject(PollService);
 
-        const analogPollValues: VoteValue[] = [];
-
-        if (pollmethod === PollMethod.N) {
-            analogPollValues.push(`N`);
-        } else {
-            analogPollValues.push(`Y`);
-
-            if (pollmethod !== PollMethod.Y) {
-                analogPollValues.push(`N`);
-            }
-            if (pollmethod === PollMethod.YNA) {
-                analogPollValues.push(`A`);
-            }
-        }
-
-        return analogPollValues;
-    }
-
-    protected getContentObjectsForOptions(): { text: string }[] {
-        const optionsArray = [];
-        this.newOptions.forEach(value => {
-            optionsArray.push({ text: value.getTitle() });
-        });
-        return optionsArray;
-    }
-
-    public removeOption(item: TextOptionSelectable): void {
-        this.newOptions.forEach((value, index) => {
-            if (value.id === item.id) {
-                this.newOptions.splice(index, 1);
-            }
-        });
-        this.updateOptionsSubject();
-    }
-
-    public addNewOption(): void {
-        const newOption = new TextOptionSelectable(this.optionInput);
-        this.newOptions.push(newOption);
-        this.optionInput = ``;
-        this.updateOptionsSubject();
-    }
-
-    /**
-     * Triggers an update of the sorting.
-     */
-    public onSortingChange(options: TextOptionSelectable[]): void {
-        this.newOptions = options;
-    }
-
-    private updateOptionsSubject(): void {
-        this.optionsSubject.next(this.newOptions);
-    }
-
-    private onItemElementsChanged(): void {
-        if (this.isNearBottom) {
-            this.scrollToBottom();
-        }
-    }
-
-    private submitOptionData(): void {
-        let key = 0;
-        const transformedOptions = this.newOptions.mapToObject(option => {
-            key++;
-            return {
-                [key.toString(10)]: this.formBuilder.group(
-                    // The text for the option
-                    {
-                        text: [option.getTitle(), [Validators.required]],
-                        // for each user, create a form group with a control for each valid input (Y, N, A)
-                        ...this.analogVoteFields?.mapToObject(value => ({
-                            [value]: [``, [Validators.min(LOWEST_VOTE_VALUE)]]
-                        }))
-                    }
-                )
-            };
-        });
-        this.dialogVoteForm.setControl(`options`, this.formBuilder.group(transformedOptions));
-    }
-
-    public hasEnoughVoteFormOptions(): boolean {
-        const length = Object.keys(this.optionsFromVoteForm.controls).length;
-        if (length < this.minNumberOfOptions) {
-            return false;
-        }
-        return true;
-    }
-
-    public hasEnoughOptions(): boolean {
-        const length = this.newOptions.length;
-        if (length < this.minNumberOfOptions) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Submits the values from dialog.
-     */
     public override submitPoll(): void {
-        if (!this.isEdit) {
-            this.submitOptionData();
-            if (!this.hasEnoughOptions()) {
-                throw new Error(`Error: submitPoll called without neccessary amount of options.`);
-            }
-        }
-        super.submitPoll();
-    }
-
-    private scrollToBottom(): void {
-        if (this.scrollContainer) {
-            this.scrollContainer.scroll({
-                top: this.scrollContainer.scrollHeight,
-                left: 0,
-                behavior: `smooth`
-            });
-        }
-    }
-
-    private isUserNearBottom(): boolean {
-        if (this.scrollContainer) {
-            const threshold = 50;
-            const position = this.scrollContainer.scrollTop + this.scrollContainer.offsetHeight;
-            const height = this.scrollContainer.scrollHeight;
-            return position > height - threshold;
-        }
-        return true;
-    }
-
-    public scrolled(_e: any): void {
-        this.isNearBottom = this.isUserNearBottom();
+        const formValues = this.pollForm().getValues();
+        const config = { ...this.selectionPollForm().form.value };
+        const visibility: PollVisibility = formValues?.visibility;
+
+        const payload: PollUpdatePayload = {
+            title: formValues?.title,
+            method: `selection`,
+            method_config: config,
+            options: formValues.options,
+            option_type: `text`,
+            visibility,
+            allow_vote_split: false
+        };
+
+        if (visibility !== PollVisibility.Manually) {
+            payload.entitled_group_ids = formValues?.entitled_group_ids ?? [];
+            payload.live_voting_enabled = formValues?.live_voting_enabled ?? false;
+        }
+
+        this.dialogRef.close(payload);
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.spec.ts
deleted file mode 100644
index 03bf45c202..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TopicPollFormComponent } from './topic-poll-form.component';
-
-xdescribe(`TopicPollFormComponent`, () => {
-    let component: TopicPollFormComponent;
-    let fixture: ComponentFixture<TopicPollFormComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [TopicPollFormComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(TopicPollFormComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts
deleted file mode 100644
index b37849b2a7..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component, ViewEncapsulation } from '@angular/core';
-import {
-    BasePollFormComponent,
-    PollFormHideSelectsData
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component';
-
-@Component({
-    selector: `os-topic-poll-form`,
-    templateUrl: `../../../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.html`,
-    styleUrls: [`../../../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.scss`],
-    providers: [{ provide: BasePollFormComponent, useExisting: TopicPollFormComponent }],
-    encapsulation: ViewEncapsulation.None,
-    standalone: false
-})
-export class TopicPollFormComponent extends BasePollFormComponent {
-    public get hideSelects(): PollFormHideSelectsData {
-        return {
-            type: true,
-            pollMethod: true,
-            globalOptions: true,
-            hundredPercentBase: true,
-            backendDuration: true
-        };
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.html
deleted file mode 100644
index 6820b47e7f..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.html
+++ /dev/null
@@ -1,83 +0,0 @@
-@if (poll) {
-    <!-- Candidates -->
-    @if (poll.options?.length && showOptions) {
-        <small class="meta-info-left subtitle">
-            <div>
-                {{ 'Options' | translate }}:
-                <ul>
-                    @for (option of poll.options; track option) {
-                        <li>{{ getOptionTitle(option) | translate }}</li>
-                    }
-                </ul>
-            </div>
-            @if (hasGlobalOptionEnabled) {
-                <div>
-                    {{ 'Options' | translate }}:
-                    <ul>
-                        @if (poll.global_yes) {
-                            <li>{{ pollPropertyVerbose.global_yes | translate }}</li>
-                        }
-                        @if (poll.global_no) {
-                            <li>{{ pollPropertyVerbose.global_no | translate }}</li>
-                        }
-                        @if (poll.global_abstain) {
-                            <li>{{ pollPropertyVerbose.global_abstain | translate }}</li>
-                        }
-                    </ul>
-                </div>
-            }
-        </small>
-    }
-    <div class="meta-info-right subtitle">
-        <!-- Groups who can vote -->
-        @if (poll.entitled_groups && poll.type && poll.type !== 'analog') {
-            <small>
-                {{ 'Entitled to vote' | translate }}:
-                <os-comma-separated-listing [list]="poll.entitled_groups">
-                    <ng-template let-group>{{ group.getTitle() }}</ng-template>
-                </os-comma-separated-listing>
-                <br />
-            </small>
-        }
-        <!-- Voting method -->
-        @if (poll.pollmethod) {
-            <small>
-                <span>{{ 'Voting method' | translate }}: {{ getVerbosePollMethod() | translate }}</span>
-                <br />
-            </small>
-        }
-        <!-- Amount of Votes -->
-        @if (poll.max_votes_amount > 1) {
-            <small>
-                @if (poll.max_votes_amount !== poll.min_votes_amount) {
-                    <span>{{ pollPropertyVerbose.min_votes_amount | translate }}: {{ poll.min_votes_amount }}</span>
-                    <br />
-                    <span>{{ pollPropertyVerbose.max_votes_amount | translate }}: {{ poll.max_votes_amount }}</span>
-                    <br />
-                }
-                @if (poll.max_votes_amount === poll.min_votes_amount) {
-                    <span>{{ 'Votes' | translate }}: {{ poll.max_votes_amount }}</span>
-                    <br />
-                }
-            </small>
-        }
-        <!-- Max Votes per Option -->
-        @if (poll.max_votes_per_option > 1) {
-            <small>
-                <span>{{ pollPropertyVerbose.max_votes_per_option | translate }}: {{ poll.max_votes_per_option }}</span>
-                <br />
-            </small>
-        }
-        <!-- 100% base -->
-        @if (poll.onehundred_percent_base) {
-            <small>{{ '100% base' | translate }}: {{ poll.percentBaseVerbose | translate }}</small>
-            <br />
-        }
-        <!-- Poll backend duration type -->
-        @if (poll.backend) {
-            <small>
-                {{ 'Voting duration' | translate }}: {{ POLL_BACKEND_DURATION_LABEL[poll.backend] | translate }}
-            </small>
-        }
-    </div>
-}
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.spec.ts
deleted file mode 100644
index 91fea52147..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TopicPollMetaInfoComponent } from './topic-poll-meta-info.component';
-
-xdescribe(`TopicPollMetaInfoComponent`, () => {
-    let component: TopicPollMetaInfoComponent;
-    let fixture: ComponentFixture<TopicPollMetaInfoComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [TopicPollMetaInfoComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(TopicPollMetaInfoComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts
deleted file mode 100644
index 5c61276ccb..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { PollPropertyVerbose } from 'src/app/domain/models/poll';
-import { BasePollMetaInformationComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
-
-import { TopicPollMethodVerbose } from '../../definitions';
-
-@Component({
-    selector: `os-topic-poll-meta-info`,
-    templateUrl: `./topic-poll-meta-info.component.html`,
-    styleUrls: [`./topic-poll-meta-info.component.scss`],
-    standalone: false
-})
-export class TopicPollMetaInfoComponent extends BasePollMetaInformationComponent {
-    @Input()
-    public showOptions = true;
-
-    public pollPropertyVerbose = PollPropertyVerbose;
-
-    public get hasGlobalOptionEnabled(): boolean {
-        return this.poll.hasGlobalOptionEnabled;
-    }
-
-    public userCanVote(): boolean {
-        return this.poll.canBeVotedFor();
-    }
-
-    public getOptionTitle(option: ViewOption): string {
-        return option.text;
-    }
-
-    public getVerbosePollMethod(): string {
-        return TopicPollMethodVerbose[this.poll.pollmethod];
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.spec.ts
deleted file mode 100644
index 0dd27f6223..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TopicPollVoteComponent } from './topic-poll-vote.component';
-
-xdescribe(`TopicPollVoteComponent`, () => {
-    let component: TopicPollVoteComponent;
-    let fixture: ComponentFixture<TopicPollVoteComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [TopicPollVoteComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(TopicPollVoteComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts
deleted file mode 100644
index 43154ee0d7..0000000000
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { _ } from '@ngx-translate/core';
-import { VoteValue } from 'src/app/domain/models/poll';
-import {
-    BasePollVoteComponent,
-    PollVoteViewSettings,
-    VoteOption
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-import { PromptService } from 'src/app/ui/modules/prompt-dialog';
-
-import { ViewTopic } from '../../../../view-models';
-
-@Component({
-    selector: `os-topic-poll-vote`,
-    templateUrl: `../../../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.html`,
-    styleUrls: [`../../../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
-})
-export class TopicPollVoteComponent extends BasePollVoteComponent<ViewTopic> {
-    public override readonly settings: PollVoteViewSettings = {
-        hideGlobalOptions: true
-    };
-
-    public override readonly noDataLabel = _(`Text for this option couldn't load.`);
-
-    public constructor(
-        private promptService: PromptService,
-        meetingSettingsService: MeetingSettingsService
-    ) {
-        super(meetingSettingsService);
-    }
-
-    public getActionButtonClass(actions: VoteOption, option: ViewOption, user: ViewUser = this.user): string {
-        if (
-            this.voteRequestData[user?.id]?.value[option.id] === actions.vote ||
-            this.voteRequestData[user?.id]?.value[option.id] === 1
-        ) {
-            return actions.css;
-        }
-        return ``;
-    }
-
-    public override async submitVote(user: ViewUser = this.user): Promise<void> {
-        const value = this.voteRequestData[user.id].value;
-        if (this.poll.isMethodY && this.poll.max_votes_per_option > 1 && this.isErrorInVoteEntry()) {
-            this.raiseError(this.translate.instant(`There is an error in your vote.`));
-            return;
-        }
-        const title = this.translate.instant(`Submit selection now?`);
-        const content = this.translate.instant(`Your decision cannot be changed afterwards.`);
-        const confirmed = await this.promptService.open(title, content);
-        if (confirmed) {
-            await super.submitVote(user, value);
-        }
-    }
-
-    public saveSingleVote(optionId: number, vote: VoteValue, user: ViewUser = this.user): void {
-        if (!this.voteRequestData[user.id]) {
-            throw new Error(`The user for your voting request does not exist`);
-        }
-
-        if (this.isGlobalOptionSelected(user)) {
-            delete this.voteRequestData[user.id].value;
-        }
-
-        if (this.poll.isMethodY || this.poll.isMethodN) {
-            this.saveSingleVoteMethodYOrN(optionId, vote, user);
-        } else {
-            // YN/YNA
-            this.saveSingleVoteMethodYNOrYNA(optionId, vote, user);
-        }
-    }
-
-    public override shouldStrikeOptionText(_option: ViewOption, _user: ViewUser): boolean {
-        return false;
-    }
-
-    private saveSingleVoteMethodYNOrYNA(optionId: number, vote: VoteValue, user: ViewUser = this.user): void {
-        if (this.voteRequestData[user.id].value[optionId] && this.voteRequestData[user.id].value[optionId] === vote) {
-            delete (this.voteRequestData[user.id] as any).value[optionId];
-        } else {
-            (this.voteRequestData[user.id] as any).value[optionId] = vote;
-        }
-
-        // if a user filled out every option, try to send
-        if (Object.keys(this.voteRequestData[user.id].value).length === this.poll.options.length) {
-            this.submitVote(user);
-        }
-    }
-
-    private saveSingleVoteMethodYOrN(optionId: number, vote: VoteValue, user: ViewUser = this.user): void {
-        const maxVotesAmount = this.poll.max_votes_amount;
-        const tmpVoteRequest = this.getTMPVoteRequestYOrN(maxVotesAmount, optionId, user);
-
-        this.handleVotingMethodYOrN(maxVotesAmount, tmpVoteRequest, user);
-    }
-
-    public handleVotingMethodYOrN(maxVotesAmount: number, tmpVoteRequest: any, user: ViewUser = this.user): void {
-        // check if you can still vote
-        const countedVotes = Object.keys(tmpVoteRequest).filter(key => tmpVoteRequest[key]).length;
-        if (countedVotes <= maxVotesAmount) {
-            this.voteRequestData[user.id].value = tmpVoteRequest;
-
-            // if you have no options anymore, try to send
-            if (this.getVotesCount(user) === maxVotesAmount) {
-                this.submitVote(user);
-            }
-        } else {
-            this.raiseError(
-                this.translate.instant(`You reached the maximum amount of votes. Deselect somebody first.`)
-            );
-        }
-    }
-
-    private getTMPVoteRequestYOrN(maxVotesAmount: number, optionId: number, user: ViewUser = this.user): any {
-        return this.poll.options
-            .map(option => option.id)
-            .reduce((o, n) => {
-                o[n] = 0;
-                if (maxVotesAmount === 1) {
-                    if (n === optionId && this.voteRequestData[user.id].value[n] !== 1) {
-                        o[n] = 1;
-                    }
-                } else if ((n === optionId) !== (this.voteRequestData[user.id].value[n] === 1)) {
-                    o[n] = 1;
-                }
-
-                return o;
-            }, {});
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html
index 13d754dcce..e11fc1da80 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html
@@ -1,125 +1,7 @@
 @if (shouldShowPoll) {
     <mat-card class="os-card">
         <mat-card-content>
-            <div class="topic-poll-wrapper">
-                <div>
-                    <!-- Title -->
-                    <mat-card-title>
-                        {{ poll.title }}
-                    </mat-card-title>
-                    <!-- Type and State -->
-                    <div class="type-and-state italic spacer-bottom-20">
-                        <span *osPerms="permission.pollCanManage; and: poll.isEVoting">
-                            <os-icon-container
-                                class="poll-type"
-                                color="primary"
-                                icon="info"
-                                size="large"
-                                [showIcon]="poll.isAnonymous"
-                                [swap]="true"
-                                (iconAction)="openVotingWarning()"
-                            >
-                                {{ poll.typeVerbose | translate }}
-                            </os-icon-container>
-                            @if (poll.isAnonymous) {
-                                <span>&nbsp;</span>
-                            }
-                            &middot;&nbsp;
-                        </span>
-                        <span>
-                            {{ poll.stateVerbose | translate }}
-                        </span>
-                    </div>
-                    <!-- Menu -->
-                    <div class="poll-menu">
-                        <!-- Buttons -->
-                        <button
-                            *osPerms="[permission.projectorCanManage, permission.pollCanManage]"
-                            mat-icon-button
-                            [matMenuTriggerFor]="pollItemMenu"
-                            (click)="$event.stopPropagation()"
-                        >
-                            <mat-icon>more_horiz</mat-icon>
-                        </button>
-                    </div>
-                    <!-- Change state button -->
-                    <div *osPerms="permission.pollCanManage; and: !hideChangeState">
-                        <button
-                            mat-stroked-button
-                            [disabled]="stateChangePendingObservable | async"
-                            [ngClass]="pollStateActions[poll.state]?.css"
-                            (click)="nextPollState()"
-                        >
-                            <mat-icon>{{ pollStateActions[poll.state]?.icon }}</mat-icon>
-                            <span class="next-state-label">
-                                @if ((stateChangePendingObservable | async) === false) {
-                                    {{ poll.nextStateActionVerbose | translate }}
-                                }
-                                @if (stateChangePendingObservable | async) {
-                                    {{ 'In progress, please wait ...' | translate }}
-                                }
-                            </span>
-                        </button>
-                    </div>
-                    <!-- Enter Votes Hint -->
-                    <div *osPerms="permission.pollCanManage; and: poll.isAnalog && !poll.stateHasVotes">
-                        {{ 'Edit to enter votes.' | translate }}
-                    </div>
-                </div>
-                <!-- Chart / Table -->
-                @if (poll.stateHasVotes) {
-                    <div class="poll-result-wrapper">
-                        <os-topic-poll-detail-content [poll]="poll"></os-topic-poll-detail-content>
-                    </div>
-                }
-                <!-- Poll progress bar -->
-                @if (poll && poll.isStarted) {
-                    <os-poll-progress [canManagePoll]="canManagePoll" [poll]="poll"></os-poll-progress>
-                }
-                <!-- The Vote -->
-                @if (poll.canBeVotedFor()) {
-                    <os-topic-poll-vote [poll]="poll"></os-topic-poll-vote>
-                }
-                <!-- Meta-Info -->
-                @if (showMetaInfo) {
-                    <os-topic-poll-meta-info [poll]="poll"></os-topic-poll-meta-info>
-                }
-            </div>
+            <os-poll [poll]="poll" (dialogOpened)="dialogOpened.emit($event)" />
         </mat-card-content>
     </mat-card>
 }
-
-<mat-menu #pollItemMenu="matMenu">
-    <div *osPerms="permission.pollCanManage">
-        <button mat-menu-item (click)="dialogOpened.emit()">
-            <mat-icon>edit</mat-icon>
-            <span>{{ 'Edit' | translate }}</span>
-        </button>
-    </div>
-    <div *osPerms="permission.projectorCanManage">
-        <os-projector-button
-            *osPerms="permission.projectorCanManage"
-            [menuItem]="true"
-            [object]="poll"
-        ></os-projector-button>
-    </div>
-    <button mat-menu-item (click)="downloadPdf()">
-        <mat-icon>picture_as_pdf</mat-icon>
-        <span>{{ 'Ballot papers' | translate }}</span>
-    </button>
-    <div *osPerms="permission.pollCanManage">
-        <mat-divider></mat-divider>
-
-        <!-- Reset Button -->
-        <button mat-menu-item (click)="resetState()">
-            <mat-icon color="warn">replay</mat-icon>
-            <span>{{ 'Reset state' | translate }}</span>
-        </button>
-
-        <!-- Delete button -->
-        <button class="red-warning-text" mat-menu-item (click)="deletePoll()">
-            <mat-icon>delete</mat-icon>
-            <span>{{ 'Delete' | translate }}</span>
-        </button>
-    </div>
-</mat-menu>
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.ts
index 0f2ea7a177..268053e56f 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.ts
@@ -1,22 +1,21 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { MatCardModule } from '@angular/material/card';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { BasePollComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll.component';
-import { VotingPrivacyWarningDialogService } from 'src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service';
-import { VotingService } from 'src/app/site/pages/meetings/modules/poll/services/voting.service';
+import { PollComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll/poll.component';
 import { OperatorService } from 'src/app/site/services/operator.service';
 
 import { ViewTopic } from '../../../../view-models';
-import { TopicPollPdfService } from '../../services/topic-poll-pdf.service/topic-poll-pdf.service';
 
 @Component({
     selector: `os-topic-poll`,
     templateUrl: `./topic-poll.component.html`,
     styleUrls: [`./topic-poll.component.scss`],
-    standalone: false
+    imports: [PollComponent, MatCardModule]
 })
-export class TopicPollComponent extends BasePollComponent<ViewTopic> implements OnInit {
+export class TopicPollComponent extends BasePollComponent<ViewTopic> {
+    // TODO: Use signals
     @Input()
     public set pollId(id: Id) {
         this.initializePoll(id);
@@ -25,20 +24,6 @@ export class TopicPollComponent extends BasePollComponent<ViewTopic> implements
     @Output()
     public readonly dialogOpened = new EventEmitter<void>();
 
-    public candidatesLabels: string[] = [];
-
-    /**
-     * Form for updating the poll's description
-     */
-    public descriptionForm: UntypedFormGroup;
-
-    /**
-     * @returns true if the description on the form differs from the poll's description
-     */
-    public get isDescriptionDirty(): boolean {
-        return this.descriptionForm.get(`description`).value !== this.poll.description;
-    }
-
     public get shouldShowPoll(): boolean {
         if (this.poll) {
             if (
@@ -52,54 +37,9 @@ export class TopicPollComponent extends BasePollComponent<ViewTopic> implements
         return false;
     }
 
-    public get showMetaInfo(): boolean {
-        return !this.poll.stateHasVotes && this.operator.hasPerms(Permission.pollCanManage);
-    }
-
-    public get showCandidatesInMetaInfo(): boolean {
-        return !this.poll.stateHasVotes && !this.votingService.canVote(this.poll);
-    }
-
-    public get canManagePoll(): boolean {
-        return this.operator.hasPerms(Permission.pollCanManage);
-    }
-
-    public constructor(
-        private formBuilder: UntypedFormBuilder,
-        private operator: OperatorService,
-        private votingService: VotingService,
-        private votingPrivacyDialog: VotingPrivacyWarningDialogService,
-        private pdfService: TopicPollPdfService
-    ) {
-        super();
-    }
-
-    public ngOnInit(): void {
-        this.descriptionForm = this.formBuilder.group({
-            description: this.poll ? this.poll.description : ``
-        });
-    }
-
-    /**
-     * Print the PDF of this poll with the corresponding options and numbers
-     */
-    public printBallot(): void {
-        try {
-            console.log(`Can't print ballots (yet)`);
-        } catch (e) {
-            console.error(e);
-            this.raiseError(e);
-        }
-    }
-
-    public downloadPdf(): void {
-        this.pdfService.printBallots(this.poll);
-    }
-
-    public openVotingWarning(): void {
-        this.votingPrivacyDialog.open();
-    }
+    private operator = inject(OperatorService);
 
+    // TODO: Maybe remove
     public getDetailLink(): string {
         return `/${this.poll.meeting_id}/topics/polls/${this.poll.sequential_number}`;
     }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
index ced355b56f..5545977990 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
@@ -1,75 +1,47 @@
 import { Injectable } from '@angular/core';
-import { merge, Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
-import {
-    ABSTAIN_KEY,
-    CalculablePollKey,
-    NO_KEY,
-    OptionData,
-    Poll,
-    PollBackendDurationType,
-    PollData,
-    PollMethod,
-    PollPercentBase,
-    PollTableData,
-    PollType,
-    VotingResult,
-    YES_KEY
-} from 'src/app/domain/models/poll';
+import { SelectionOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-selection';
+import { BaseOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-types';
 import { Topic } from 'src/app/domain/models/topics/topic';
-import { compareNumber } from 'src/app/infrastructure/utils';
-import { ChartDate } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component';
+import { PollDialogData } from 'src/app/site/pages/meetings/modules/poll/definitions';
 import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
 import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service';
 import { PollServiceMapperService } from 'src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 
 import { ViewTopic } from '../../../view-models';
 import { TopicPollServiceModule } from './topic-poll-service.module';
 
-interface TopicPollTableEntry {
-    label: string;
-    data: number | undefined;
-}
-
 @Injectable({
     providedIn: TopicPollServiceModule
 })
 export class TopicPollService extends PollService {
-    public defaultPollMethod: PollMethod;
-    public defaultPercentBase: PollPercentBase;
+    public defaultPercentBase: BaseOnehundredPercentBase | SelectionOnehundredPercentBase;
     public defaultGroupIds: number[];
 
     public constructor(
         pollServiceMapper: PollServiceMapperService,
-        private pollRepo: PollControllerService,
-        private meetingSettingsService: MeetingSettingsService
+        private pollRepo: PollControllerService
     ) {
         super();
         pollServiceMapper.registerService(ViewTopic.COLLECTION, this);
         this.meetingSettingsService
             .get(`poll_default_onehundred_percent_base`)
-            .subscribe(base => (this.defaultPercentBase = base ?? PollPercentBase.Y));
+            .subscribe(base => (this.defaultPercentBase = base ?? `valid`));
 
         this.meetingSettingsService
             .get(`topic_poll_default_group_ids`)
             .subscribe(ids => (this.defaultGroupIds = ids ?? []));
 
-        this.meetingSettingsService
-            .get(`poll_default_method`)
-            .subscribe(method => (this.defaultPollMethod = method ?? PollMethod.Y));
-
         this.meetingSettingsService.get(`poll_sort_poll_result_by_votes`).subscribe(sort => (this.sortByVote = sort));
     }
 
-    public getDefaultPollData(contentObject?: Topic): Partial<Poll> {
-        const poll: Partial<Poll> = {
+    public getDefaultPollData(contentObject: Topic): Partial<PollDialogData> {
+        const poll: Partial<PollDialogData> = {
+            content_object: contentObject,
             title: this.translate.instant(`Vote`),
-            onehundred_percent_base: this.defaultPercentBase,
-            entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
-            pollmethod: this.defaultPollMethod,
-            type: PollType.Pseudoanonymous,
-            backend: PollBackendDurationType.FAST
+            // onehundred_percent_base: this.defaultPercentBase,
+            // pollmethod: this.defaultPollMethod,
+            // type: PollType.Pseudoanonymous,
+            entitled_group_ids: Object.values(this.defaultGroupIds ?? [])
         };
 
         if (contentObject) {
@@ -81,117 +53,4 @@ export class TopicPollService extends PollService {
 
         return poll;
     }
-
-    public generateTableDataAsObservable(poll: PollData): Observable<PollTableData[]> {
-        // The "of(...)"-observable is used to fire the current state the first time.
-        return merge(of(poll.options), poll.options$).pipe(map(options => this.createTableData(poll, options)));
-    }
-
-    private createTableData(poll: PollData, options: OptionData[]): PollTableData[] {
-        let tableData: PollTableData[] = options.flatMap(option =>
-            super.getVoteTableKeys(poll).map(key => this.createTableDataEntry(poll, key, option))
-        );
-        tableData.push(...super.getSumTableKeys(poll).map(key => this.createTableDataEntry(poll, key)));
-
-        tableData = tableData.filter(localeTableData => !localeTableData.value.some(result => result.hide));
-        return tableData;
-    }
-
-    private createTableDataEntry(poll: PollData, result: VotingResult, option?: OptionData): PollTableData {
-        return {
-            votingOption: result.vote,
-            votingOptionSubtitle: option ? option.getOptionTitle().title : ``,
-            value: [
-                {
-                    amount: option ? option[result.vote] : poll[result.vote],
-                    hide: result.hide,
-                    icon: result.icon,
-                    showPercent: result.showPercent
-                }
-            ]
-        };
-    }
-
-    public shouldShowChart(poll: PollData): boolean {
-        return (
-            poll &&
-            poll.options &&
-            poll.options.some(option => option.yes >= 0 && option.no >= 0 && option.abstain >= 0)
-        );
-    }
-
-    public getSortedTableData(poll: PollData): TopicPollTableEntry[] {
-        const data = this.getResultFromPoll(poll, YES_KEY);
-        const labels = poll.options.map(option => option.getOptionTitle().title);
-        let labelsAndData: TopicPollTableEntry[] = [];
-        labels.forEach((value, index) => labelsAndData.push({ data: data[index], label: labels[index] }));
-        labelsAndData = labelsAndData.sort((a: { data: number; label: string }, b: { data: number; label: string }) =>
-            compareNumber(a.data, b.data)
-        );
-        return labelsAndData;
-    }
-
-    public override generateChartData(poll: PollData): ChartDate[] {
-        const fields = this.getPollDataFields(poll);
-
-        const data: ChartDate[] = fields.map(
-            key =>
-                ({
-                    data: this.getResultFromPoll(poll, key).sort((a, b) => compareNumber(a, b)),
-                    label: key.toUpperCase(),
-                    backgroundColor: this.themeService.getPollColor(key),
-                    hoverBackgroundColor: this.themeService.getPollColor(key),
-                    barThickness: 20,
-                    maxBarThickness: 20
-                }) as ChartDate
-        );
-
-        return data;
-    }
-
-    /**
-     * Extracts yes-no-abstain such as valid, invalids and totals from Poll and PollData-Objects
-     */
-    protected override getResultFromPoll(poll: PollData, key: CalculablePollKey): number[] {
-        return [...poll.options].map(option => (option ? option[key] : undefined));
-    }
-
-    protected override getPollDataFields(poll: PollData): CalculablePollKey[] {
-        const keys = [];
-        switch (poll.pollmethod) {
-            case PollMethod.YNA: {
-                keys.push(...[YES_KEY, NO_KEY, ABSTAIN_KEY]);
-                break;
-            }
-            case PollMethod.YN: {
-                keys.push(...[YES_KEY, NO_KEY]);
-                break;
-            }
-            case PollMethod.N: {
-                keys.push(NO_KEY);
-                break;
-            }
-            default: {
-                keys.push(YES_KEY);
-            }
-        }
-        return keys;
-    }
-
-    protected override getPercentBase(poll: PollData, row?: OptionData): number {
-        const base = poll.onehundred_percent_base as PollPercentBase;
-        switch (base) {
-            case PollPercentBase.Y:
-                return this.getSumOptionsY(poll);
-            default:
-                return super.getPercentBase(poll, row);
-        }
-    }
-
-    private getSumOptionsY(poll: PollData): number {
-        if (!poll.options?.length) {
-            return 0;
-        }
-        return poll.votesvalid;
-    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts
index b5dc1915e4..af38288a7c 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/topic-poll.module.ts
@@ -28,25 +28,17 @@ import { TopicCommonServiceModule } from '../../services/topic-common-service.mo
 import { TopicPollComponent } from './components/topic-poll/topic-poll.component';
 import { TopicPollDetailContentComponent } from './components/topic-poll-detail-content/topic-poll-detail-content.component';
 import { TopicPollDialogComponent } from './components/topic-poll-dialog/topic-poll-dialog.component';
-import { TopicPollFormComponent } from './components/topic-poll-form/topic-poll-form.component';
-import { TopicPollMetaInfoComponent } from './components/topic-poll-meta-info/topic-poll-meta-info.component';
-import { TopicPollVoteComponent } from './components/topic-poll-vote/topic-poll-vote.component';
 import { TopicPollService } from './services/topic-poll.service';
 import { TopicPollServiceModule } from './services/topic-poll-service.module';
 
 @NgModule({
-    declarations: [
-        TopicPollComponent,
-        TopicPollDetailContentComponent,
-        TopicPollDialogComponent,
-        TopicPollMetaInfoComponent,
-        TopicPollVoteComponent,
-        TopicPollFormComponent
-    ],
+    declarations: [TopicPollDetailContentComponent],
     imports: [
         CustomIconComponent,
         CommonModule,
         CommaSeparatedListingComponent,
+        TopicPollComponent,
+        TopicPollDialogComponent,
         TopicPollServiceModule,
         TopicCommonServiceModule,
         FormsModule,
@@ -71,7 +63,7 @@ import { TopicPollServiceModule } from './services/topic-poll-service.module';
         DirectivesModule,
         OpenSlidesTranslationModule.forChild()
     ],
-    exports: [TopicPollComponent, TopicPollVoteComponent, TopicPollDetailContentComponent],
+    exports: [TopicPollDetailContentComponent, TopicPollComponent],
     providers: [{ provide: PollService, useClass: TopicPollService }]
 })
 export class TopicPollModule {}
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
index 915e7e84b8..13e1fdc7db 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
@@ -164,8 +164,8 @@ <h4>{{ 'Text' | translate }}</h4>
     @if (!editTopic) {
         <div class="spacer-bottom-60">
             @if (topic && topic.poll_ids?.length) {
-                @for (poll of topic.poll_ids | reverse; track trackById($index, poll)) {
-                    <os-topic-poll [pollId]="poll" (dialogOpened)="openDialog(poll)"></os-topic-poll>
+                @for (poll of topic.polls | reverse; track trackById($index, poll)) {
+                    <os-topic-poll [pollId]="poll.id" (dialogOpened)="openDialog(poll.id)"></os-topic-poll>
                 }
             }
             @if (topic && isEVotingEnabled) {
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts
index 1ffadb2a92..b5e5dedd58 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.ts
@@ -412,11 +412,7 @@ export class TopicDetailComponent extends BaseMeetingComponent implements OnInit
         if (pollId) {
             return this.pollController.getViewModel(pollId)!;
         } else {
-            return {
-                collection: ViewPoll.COLLECTION,
-                content_object_id: this.topic.fqid,
-                ...this.topicPollService.getDefaultPollData(this.topic)
-            } as Partial<PollDialogData>;
+            return this.topicPollService.getDefaultPollData(this.topic);
         }
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts
index a02784b69f..650d2de69a 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/topic-detail.module.ts
@@ -14,6 +14,7 @@ import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations';
 import { ListOfSpeakersContentModule } from 'src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module';
 import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector';
 import { AttachmentControlModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control';
+import { PollComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll/poll.component';
 import { DirectivesModule } from 'src/app/ui/directives';
 import { EditorModule } from 'src/app/ui/modules/editor';
 import { HeadBarModule } from 'src/app/ui/modules/head-bar';
@@ -36,6 +37,7 @@ import { TopicDetailRoutingModule } from './topic-detail-routing.module';
         TopicCommonServiceModule,
         HeadBarModule,
         PipesModule,
+        PollComponent,
         DirectivesModule,
         AttachmentControlModule,
         MeetingsComponentCollectorModule,
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts
index 25467d1957..84fffaee8f 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Content, ContentText } from 'pdfmake/interfaces';
-import { PollMethod, PollTableData, VotingResult } from 'src/app/domain/models/poll';
+import { PollTableData, VotingResult } from 'src/app/domain/models/poll';
 import { HtmlToPdfService } from 'src/app/gateways/export/html-to-pdf.service';
 import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export';
 
-import { ViewPoll } from '../../../../../polls';
+import { ViewPoll, ViewPollConfigSelection } from '../../../../../polls';
 import { TopicPollService } from '../../modules/topic-poll/services/topic-poll.service';
 import { ViewTopic } from '../../view-models';
 import { TopicCommonServiceModule } from '../topic-common-service.module';
@@ -155,9 +155,9 @@ export class TopicPdfService {
     private getPollResult(votingResult: PollTableData, poll: ViewPoll): string {
         const resultList = votingResult.value
             .filter((singleResult: VotingResult) => {
-                if (poll.pollmethod === PollMethod.Y) {
+                if (poll.config instanceof ViewPollConfigSelection) {
                     return singleResult.vote !== `no` && singleResult.vote !== `abstain`;
-                } else if (poll.pollmethod === PollMethod.YN) {
+                } else if (!poll.config?.allow_abstain) {
                     return singleResult.vote !== `abstain`;
                 } else {
                     return true;
diff --git a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts
index 4f689c973a..55fadb7ee8 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts
+++ b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts
@@ -450,11 +450,12 @@ export class AgendaPdfCatalogExportService {
                 // poll table rows
                 let optionIndex = 0;
                 for (const option of poll.options) {
-                    let votesForOption: string | number = ``;
+                    const votesForOption: string | number = ``;
+                    // TODO: Readd votes for option
                     if (poll.stateHasVotes && useVoteWeight) {
-                        votesForOption = option.votes.map(v => parseFloat(`${v.weight}`)).reduce((a, b) => a + b, 0);
+                        // votesForOption = option.votes.map(v => parseFloat(`${v.weight}`)).reduce((a, b) => a + b, 0);
                     } else if (poll.stateHasVotes) {
-                        votesForOption = option.votes.length;
+                        // votesForOption = option.votes.length;
                     }
                     const backgroundColor = optionIndex % 2 ? TABLEROW_GREY : undefined;
                     tableCells.push([
@@ -465,7 +466,8 @@ export class AgendaPdfCatalogExportService {
                     optionIndex++;
                 }
                 // poll table valid votes line
-                const amount: string = poll.votesvalid ? String(poll.votesvalid) : ``;
+                // TODO: Reenable
+                const amount = ``; // poll.votesvalid ? String(poll.votesvalid) : ``;
                 tableCells.push([{ text: `` }, { text: this.translate.instant(`Valid votes`) }, { text: amount }]);
 
                 // table configuration
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts
index a654fe9f5a..03725fe9af 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/assignment-poll.module.ts
@@ -31,23 +31,17 @@ import { AssignmentCommonServiceModule } from '../../services/assignment-common-
 import { AssignmentPollComponent } from './components/assignment-poll/assignment-poll.component';
 import { AssignmentPollDetailContentComponent } from './components/assignment-poll-detail-content/assignment-poll-detail-content.component';
 import { AssignmentPollDialogComponent } from './components/assignment-poll-dialog/assignment-poll-dialog.component';
-import { AssignmentPollFormComponent } from './components/assignment-poll-form/assignment-poll-form.component';
-import { AssignmentPollMetaInfoComponent } from './components/assignment-poll-meta-info/assignment-poll-meta-info.component';
-import { AssignmentPollVoteComponent } from './components/assignment-poll-vote/assignment-poll-vote.component';
 import { AssignmentPollService } from './services/assignment-poll.service';
 import { AssignmentPollServiceModule } from './services/assignment-poll-service.module';
 
-const COMPONENTS = [
-    AssignmentPollComponent,
-    AssignmentPollDetailContentComponent,
-    AssignmentPollMetaInfoComponent,
-    AssignmentPollVoteComponent // TODO: Only exported to have access to it in the autopilot
-];
+const COMPONENTS = [AssignmentPollDetailContentComponent];
 
 @NgModule({
-    declarations: [...COMPONENTS, AssignmentPollDialogComponent, AssignmentPollFormComponent],
-    exports: [...COMPONENTS, PollModule, AssignmentPollServiceModule],
+    declarations: [...COMPONENTS],
+    exports: [...COMPONENTS, PollModule, AssignmentPollServiceModule, AssignmentPollComponent],
     imports: [
+        AssignmentPollComponent,
+        AssignmentPollDialogComponent,
         ArrowNavigationDirective,
         CustomIconComponent,
         CommonModule,
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-detail-content/assignment-poll-detail-content.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-detail-content/assignment-poll-detail-content.component.ts
index f7894311db..e157aaf945 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-detail-content/assignment-poll-detail-content.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-detail-content/assignment-poll-detail-content.component.ts
@@ -1,24 +1,7 @@
-import {
-    AfterViewInit,
-    ChangeDetectorRef,
-    Component,
-    ElementRef,
-    Input,
-    OnInit,
-    QueryList,
-    ViewChildren
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Input, QueryList, ViewChildren } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { auditTime, combineLatest, filter, iif, map, NEVER, startWith, switchMap } from 'rxjs';
 import { Permission } from 'src/app/domain/definitions/permission';
-import { PollData } from 'src/app/domain/models/poll/generic-poll';
-import {
-    PollMethod,
-    PollPercentBase,
-    PollState,
-    PollTableData,
-    VotingResult
-} from 'src/app/domain/models/poll/poll-constants';
+import { PollState, PollTableData, VotingResult } from 'src/app/domain/models/poll/poll-constants';
 import { Deferred } from 'src/app/infrastructure/utils/promises';
 import { ChartData } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component';
 import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
@@ -31,12 +14,14 @@ import { AssignmentPollService } from '../../services/assignment-poll.service';
 
 @Component({
     selector: `os-assignment-poll-detail-content`,
-    templateUrl: `./assignment-poll-detail-content.component.html`,
+    template: `
+        TODO
+    `,
     styleUrls: [`./assignment-poll-detail-content.component.scss`],
     standalone: false
 })
-export class AssignmentPollDetailContentComponent implements OnInit, AfterViewInit {
-    private _poll: PollData;
+export class AssignmentPollDetailContentComponent implements AfterViewInit {
+    private _poll: ViewPoll;
 
     public readonly hasLoaded = new Deferred<boolean>();
 
@@ -45,13 +30,13 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
     public reformedTableData: PollTableData[];
 
     @Input()
-    public set poll(pollData: PollData) {
+    public set poll(pollData: ViewPoll) {
         this._poll = pollData;
-        this.setupTableData();
+        // this.setupTableData();
         this.cd.markForCheck();
     }
 
-    public get poll(): PollData {
+    public get poll(): ViewPoll {
         return this._poll;
     }
 
@@ -73,46 +58,14 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
     }
 
     private get method(): string | null {
-        return this.poll?.pollmethod || null;
+        // TODO: Replace
+        return null;
     }
 
     private get state(): PollState | null {
         return this.poll?.state || null;
     }
 
-    public get showYHeader(): boolean {
-        return this.isMethodY || this.isMethodYN || this.isMethodYNA;
-    }
-
-    public get showNHeader(): boolean {
-        return this.isMethodN || this.isMethodYN || this.isMethodYNA;
-    }
-
-    public get isMethodY(): boolean {
-        return this.method === PollMethod.Y;
-    }
-
-    public get isMethodN(): boolean {
-        return this.method === PollMethod.N;
-    }
-
-    public get isMethodYN(): boolean {
-        return this.method === PollMethod.YN;
-    }
-
-    public get isMethodYNA(): boolean {
-        return this.method === PollMethod.YNA;
-    }
-
-    public get classOptionAmount(): string {
-        if (this.isMethodY || this.isMethodN) {
-            return `row-1`;
-        } else if (this.isMethodYN) {
-            return `row-2`;
-        }
-        return `row-3`;
-    }
-
     public get isStarted(): boolean {
         return this.state === PollState.Started;
     }
@@ -122,13 +75,13 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
     }
 
     public get isPublished(): boolean {
-        return this.state === PollState.Published;
+        return this.isFinished && this.poll?.published;
     }
 
     public get shouldShowChart(): boolean {
-        const validOptions = this.poll.options.some(
+        const validOptions = false; /* this.poll.options.some(
             option => option.yes! >= 0 && option.no! >= 0 && option.abstain! >= 0
-        );
+        ); */
         return this.poll.options.length === 1 && this.chartData.length > 0 && validOptions;
     }
 
@@ -140,16 +93,9 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
         return this.operator.hasPerms(Permission.assignmentCanManagePolls) || this.isPublished;
     }
 
-    public get isPercentBaseEntitled(): boolean {
-        return this.poll?.onehundred_percent_base === PollPercentBase.Entitled;
-    }
-
-    public get isPercentBaseEntitledPresent(): boolean {
-        return this.poll?.onehundred_percent_base === PollPercentBase.EntitledPresent;
-    }
-
     public get entitledPresentUsersCount(): number {
-        return this.poll?.entitled_users_at_stop.filter(x => x.present).length || 0;
+        // return this.poll?.entitled_users_at_stop.filter(x => x.present).length || 0;
+        return 0;
     }
 
     public get assignmentPollService(): PollService {
@@ -165,7 +111,8 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
     }
 
     public get showEntriesAmount(): boolean {
-        return !!this.poll.options[0]?.entries_amount;
+        // return !!this.poll.options[0]?.entries_amount;
+        return false;
     }
 
     public constructor(
@@ -176,7 +123,8 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
         private themeService: ThemeService
     ) {}
 
-    public ngOnInit(): void {
+    public _ngOnInit(): void {
+        /*
         combineLatest([
             this.poll.options$,
             iif(
@@ -196,56 +144,15 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
             ).pipe(startWith(null)),
             this.themeService.currentGeneralColorsSubject
         ]).subscribe(() => this.setupTableData());
+        */
     }
 
     public ngAfterViewInit(): void {
         setTimeout(() => this.hasLoaded.resolve(true));
     }
 
-    private setupTableData(): void {
-        this._tableData = this.pollService.generateTableData(this.poll);
-        this.updateReformedTableData();
-        this.setChartData();
-        this.cd.markForCheck();
-    }
-
-    private updateReformedTableData(): void {
-        this.reformedTableData = [];
-        this.tableData.forEach(tableDate => {
-            if ([`user`, `list`].includes(tableDate.class)) {
-                tableDate.value.forEach(value => {
-                    if (this.voteFitsMethod(value)) {
-                        this.reformedTableData.push({
-                            class: tableDate.class,
-                            votingOption: value.vote,
-                            value: [value]
-                        });
-                    }
-                });
-            } else {
-                this.reformedTableData.push(tableDate);
-            }
-        });
-    }
-
-    private setChartData(): void {
-        this._chartData = this.pollService.generateChartData(this.poll).filter(option => option.data[0] > 0);
-    }
-
-    public getVoteClass(votingResult: VotingResult): string {
-        const votingClass = votingResult.vote as string;
-        if (this.isMethodN && votingClass === `no`) {
-            return `yes`;
-        } else {
-            return votingClass;
-        }
-    }
-
-    public filterRelevantResults(votingResult: VotingResult[]): VotingResult[] {
-        return votingResult.filter(result => result && this.voteFitsMethod(result));
-    }
-
-    public getVoteAmount(vote: VotingResult, row: PollTableData): number {
+    public getVoteAmount(_vote: VotingResult, _row: PollTableData): number {
+        /*
         vote.amount = vote.amount ?? 0;
         if (this.isMethodN && [`user`, `list`].includes(row.class)) {
             if (vote.amount < 0) {
@@ -257,21 +164,8 @@ export class AssignmentPollDetailContentComponent implements OnInit, AfterViewIn
         } else {
             return vote.amount;
         }
-    }
-
-    public voteFitsMethod(result: VotingResult): boolean {
-        if (!result.vote) {
-            return true;
-        }
-        if (this.isMethodY) {
-            return result.vote === `yes`;
-        } else if (this.isMethodN) {
-            return result.vote === `no`;
-        } else if (this.isMethodYN) {
-            return result.vote !== `abstain`;
-        } else {
-            return true;
-        }
+        */
+        return 0;
     }
 
     public ariaLabel(str: string): string {
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
index 68e712bedc..4c6be2b67e 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.html
@@ -1,76 +1,25 @@
 <mat-dialog-content>
-    <os-assignment-poll-form
-        #pollForm
-        [allowToSetMinMax]="true"
-        [data]="pollData"
-        [percentBases]="AssignmentPollPercentBaseVerbose"
-        [pollClassType]="pollClassType.Assignment"
-        [pollMethods]="AssignmentPollMethodVerbose"
-        [pollOptionAmount]="getOptionAmount()"
-        [pollService]="assignmentPollService"
-    />
-
-    <!-- Analog voting -->
-    @if (isAnalogPoll && dialogVoteForm && !reloading) {
-        <form [formGroup]="dialogVoteForm">
-            <!-- Candidates Values -->
-            <div formGroupName="options">
-                @for (option of options; track option) {
-                    <div class="votes-grid">
-                        <div class="candidate">
-                            @if (option.content_object && option.content_object['getFullName']) {
-                                <span>
-                                    {{ option.content_object | toString: 'getFullName' }}
-                                </span>
-                            }
-                            @if (!option.content_object && !option.poll_candidate_user_ids) {
-                                <i>
-                                    {{ unknownUserLabel | translate }}
-                                </i>
-                            }
-                        </div>
-                        <div class="amount">
-                            @for (value of analogVoteFields; track value) {
-                                <div [formGroupName]="calculateOptionKey(option)">
-                                    <os-check-input
-                                        inputType="number"
-                                        [checkboxLabel]="'majority' | translate"
-                                        [checkboxValue]="-1"
-                                        [formControlName]="value"
-                                        [placeholder]="voteValueVerbose[value] | translate"
-                                    ></os-check-input>
-                                </div>
-                            }
-                        </div>
-                        <mat-divider></mat-divider>
-                    </div>
-                }
-            </div>
-            <!-- Sum Values -->
-            @for (value of sumValues; track value) {
-                <div class="votes-grid">
-                    <div class="assignment-dialog-input--container">
-                        <mat-form-field class="amount">
-                            <mat-label>{{ generalValueVerbose[value] | translate }}</mat-label>
-                            <input matInput type="number" [formControlName]="value" />
-                        </mat-form-field>
-                    </div>
+    <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled">
+        <mat-tab-group [(selectedIndex)]="selectedTab">
+            <mat-tab label="Selection">
+                <div class="tab-content">
+                    <os-poll-form-selection optionType="meeting_user" [data]="pollData" />
+                </div>
+            </mat-tab>
+            <mat-tab label="Approval per candidate">
+                <div class="tab-content">
+                    <os-poll-form-rating-approval optionType="meeting_user" [data]="pollData" />
+                </div>
+            </mat-tab>
+            <mat-tab label="List">
+                <div class="tab-content">
+                    <os-poll-form-approval [data]="pollData" />
                 </div>
-            }
-        </form>
-        <!-- Publish Check -->
-        <div class="spacer-top-20">
-            <mat-checkbox [(ngModel)]="publishImmediately" (change)="publishStateChanged($event.checked)">
-                <span>{{ 'Publish immediately' | translate }}</span>
-            </mat-checkbox>
-            @if (!dialogVoteForm.valid) {
-                <mat-error>{{ 'Error in form field.' | translate }}</mat-error>
-            }
-        </div>
-    }
+            </mat-tab>
+        </mat-tab-group>
+    </os-poll-form>
 </mat-dialog-content>
 
-<!-- Actions -->
 <mat-dialog-actions>
     <!-- Save Button -->
     <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.scss b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.scss
index b638fe908e..5fbaedc402 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.scss
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.scss
@@ -9,3 +9,7 @@
         padding: 0 5px;
     }
 }
+
+.tab-content {
+    padding-top: 12px;
+}
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
index f05dc494fe..af2ae7939d 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-dialog/assignment-poll-dialog.component.ts
@@ -1,103 +1,84 @@
-import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { debounceTime, distinctUntilChanged } from 'rxjs';
-import { BaseModel } from 'src/app/domain/models/base/base-model';
-import {
-    GeneralValueVerbose,
-    GlobalOptionKey,
-    PollMethod,
-    PollPercentBaseVerbose,
-    PollPropertyVerbose,
-    VoteValue
-} from 'src/app/domain/models/poll';
-import {
-    BasePollDialogComponent,
-    OptionsObject
-} from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
+import { Component, inject, signal, viewChild } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatTabsModule } from '@angular/material/tabs';
+import { TranslatePipe } from '@ngx-translate/core';
+import { PollVisibility } from 'src/app/domain/models/poll';
+import { PollUpdatePayload } from 'src/app/gateways/vote-api.service';
+import { BasePollDialogComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
+import { PollFormComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component';
+import { PollFormApprovalComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component';
+import { PollFormRatingApprovalComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form-rating-approval/poll-form-rating-approval.component';
+import { PollFormSelectionComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form-selection/poll-form-selection.component';
+import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
 import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 
-import { AssignmentPollMethodVerbose, AssignmentPollPercentBaseVerbose } from '../../definitions';
-import { AssignmentPollService, UnknownUserLabel } from '../../services/assignment-poll.service';
+const TAB_METHOD_MAP = [`selection`, `rating_approval`, `approval`];
 
 @Component({
     selector: `os-assignment-poll-dialog`,
     templateUrl: `./assignment-poll-dialog.component.html`,
     styleUrls: [`./assignment-poll-dialog.component.scss`],
-    standalone: false
+    imports: [
+        PollFormComponent,
+        PollFormApprovalComponent,
+        PollFormSelectionComponent,
+        PollFormRatingApprovalComponent,
+        MatDialogModule,
+        MatButtonModule,
+        MatTabsModule,
+        TranslatePipe
+    ]
 })
 export class AssignmentPollDialogComponent extends BasePollDialogComponent {
-    public unknownUserLabel = UnknownUserLabel;
+    private approvalForm = viewChild(PollFormApprovalComponent);
+    private selectionForm = viewChild(PollFormSelectionComponent);
+    private ratingApprovalForm = viewChild(PollFormRatingApprovalComponent);
 
-    /**
-     * List of accepted special non-numerical values.
-     * See {@link PollService.specialPollVotes}
-     */
-    public specialValues: [number, string][] = [];
+    public method = `rating_approval`;
 
-    public generalValueVerbose = GeneralValueVerbose;
-    public PollPropertyVerbose = PollPropertyVerbose;
-
-    public AssignmentPollMethodVerbose = AssignmentPollMethodVerbose;
-    public get AssignmentPollPercentBaseVerbose(): Record<string, string> {
-        return this.pollData.isListPoll ? PollPercentBaseVerbose : AssignmentPollPercentBaseVerbose;
+    public get isEVotingEnabled(): boolean {
+        return this.pollService.isElectronicVotingEnabled;
     }
 
-    public readonly globalValues: GlobalOptionKey[] = [`global_yes`, `global_no`, `global_abstain`];
+    public selectedTab = signal(0);
 
-    /**
-     * Constructor. Retrieves necessary metadata from the pollService,
-     * injects the poll itself
-     */
-    public constructor(
-        public readonly assignmentPollService: AssignmentPollService,
-        @Inject(MAT_DIALOG_DATA) pollData: ViewPoll
-    ) {
-        super(pollData);
-    }
+    private pollService = inject(PollService);
 
-    public override onBeforeInit(): void {
-        this.subscriptions.push(
-            this.pollForm!.contentForm.valueChanges.pipe(debounceTime(150), distinctUntilChanged()).subscribe(() => {
-                this.triggerUpdate();
-            })
-        );
-    }
+    public override submitPoll(): void {
+        const formValues = this.pollForm().getValues();
+        const visibility: PollVisibility = formValues?.visibility;
 
-    public getOptionAmount(): number {
-        return this._options?.length;
-    }
+        const assignment = this.pollData?.content_object as ViewAssignment;
+        const options = assignment.candidates.map(c => c.meeting_user_id);
 
-    public optionIsList(option: OptionsObject): boolean {
-        return !!option.poll_candidate_user_ids?.length;
-    }
+        const payload: PollUpdatePayload = {
+            title: formValues?.title,
+            method: TAB_METHOD_MAP[this.selectedTab()],
+            method_config: this.getMethodConfig(),
+            option_type: `meeting_user`,
+            options,
+            visibility,
+            allow_vote_split: false
+        };
 
-    protected getContentObjectsForOptions(): BaseModel[] {
-        if (!this.pollData) {
-            return [];
+        if (visibility !== PollVisibility.Manually) {
+            payload.entitled_group_ids = formValues?.entitled_group_ids ?? [];
+            payload.live_voting_enabled = formValues?.live_voting_enabled ?? false;
         }
-        const contentObject = this.pollData.content_object as ViewAssignment;
-        return contentObject.candidatesAsUsers;
-    }
-
-    protected getAnalogVoteFields(): VoteValue[] {
-        const pollmethod = this.pollForm!.contentForm.get(`pollmethod`)!.value;
-
-        const analogPollValues: VoteValue[] = [];
 
-        if (pollmethod === PollMethod.N) {
-            analogPollValues.push(`N`);
-        } else {
-            analogPollValues.push(`Y`);
+        this.dialogRef.close(payload);
+    }
 
-            if (pollmethod !== PollMethod.Y) {
-                analogPollValues.push(`N`);
-            }
-            if ((pollmethod as string).toUpperCase() === PollMethod.YNA) {
-                analogPollValues.push(`A`);
-            }
+    private getMethodConfig(): unknown {
+        switch (TAB_METHOD_MAP[this.selectedTab()]) {
+            case `approval`:
+                return { ...this.approvalForm()?.approvalForm.value };
+            case `selection`:
+                return { ...this.selectionForm()?.form.value };
+            case `rating_approval`:
+                return { ...this.ratingApprovalForm()?.form.value };
         }
-
-        return analogPollValues;
+        return {};
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.spec.ts
deleted file mode 100644
index 1d35b8d63f..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssignmentPollFormComponent } from './assignment-poll-form.component';
-
-xdescribe(`AssignmentPollFormComponent`, () => {
-    let component: AssignmentPollFormComponent;
-    let fixture: ComponentFixture<AssignmentPollFormComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [AssignmentPollFormComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(AssignmentPollFormComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.ts
deleted file mode 100644
index ca31a9152e..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-form/assignment-poll-form.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { _ } from '@ngx-translate/core';
-import { PollPropertyVerboseKey } from 'src/app/domain/models/poll';
-import {
-    BasePollFormComponent,
-    PollFormHideSelectsData
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component';
-
-import { ViewAssignment } from '../../../../view-models';
-
-@Component({
-    selector: `os-assignment-poll-form`,
-    templateUrl: `../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.html`,
-    styleUrls: [`../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.scss`],
-    providers: [{ provide: BasePollFormComponent, useExisting: AssignmentPollFormComponent }],
-    encapsulation: ViewEncapsulation.None,
-    standalone: false
-})
-export class AssignmentPollFormComponent extends BasePollFormComponent implements OnInit {
-    public override PollPropertyVerbose: Record<PollPropertyVerboseKey, string> = {
-        ...this.PollPropertyVerbose,
-        pollmethod: _(`Election method`)
-    };
-
-    public get hideSelects(): PollFormHideSelectsData {
-        return {
-            globalOptions: false
-        };
-    }
-
-    public override ngOnInit(): void {
-        if (this.data && this.data?.isAssignmentPoll) {
-            if (!!this.data.getContentObject() && !this.data.max_votes_amount) {
-                const assignment = this.data.getContentObject() as ViewAssignment;
-                this.data.max_votes_amount = assignment.open_posts;
-            }
-            if (!this.data.pollmethod) {
-                this.data.pollmethod = this.meetingSettingsService.instant(`assignment_poll_default_method`);
-            }
-        }
-        super.ngOnInit();
-    }
-
-    protected override updatePollValues(data: Record<string, any>, additionalPollValues?: string[]): void {
-        let values = [];
-        if (additionalPollValues) {
-            values = additionalPollValues;
-        }
-        values.push(`pollmethod`);
-        super.updatePollValues(data, values);
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.html b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.html
deleted file mode 100644
index 8902bdf7c9..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.html
+++ /dev/null
@@ -1,120 +0,0 @@
-@if (poll) {
-    <!-- Candidates -->
-    @if (poll.options?.length && showCandidates) {
-        <small class="meta-info-left subtitle">
-            <os-expandable-content-wrapper [disableExpandControl]="!shortenList">
-                @if (!poll.isListPoll) {
-                    <div>
-                        {{ poll.options.length ? poll.options.length + ' ' : '' }}{{ 'Candidates' | translate }}:
-                        @if (enumerateCandidates) {
-                            <ol>
-                                @for (option of poll.options; track option.id) {
-                                    <li>{{ getOptionTitle(option) | translate }}</li>
-                                }
-                            </ol>
-                        }
-                        @if (!enumerateCandidates) {
-                            <ul>
-                                @for (option of poll.options; track option.id) {
-                                    <li>{{ getOptionTitle(option) | translate }}</li>
-                                }
-                            </ul>
-                        }
-                    </div>
-                }
-                @if (poll.isListPoll && poll.options[0]?.contentTitlesAsSortedArray.length) {
-                    <div>
-                        {{ 'Nomination list' | translate }} ({{ poll.options[0]?.contentTitlesAsSortedArray.length }}
-                        {{ 'Candidates' | translate }}):
-                        @if (enumerateCandidates) {
-                            <ol>
-                                @for (title of poll.options[0]?.contentTitlesAsSortedArray; track $index) {
-                                    <li>{{ title.title }}{{ title.subtitle ? ' (' + title.subtitle + ')' : '' }}</li>
-                                }
-                            </ol>
-                        }
-                        @if (!enumerateCandidates) {
-                            <ul>
-                                @for (title of poll.options[0]?.contentTitlesAsSortedArray; track $index) {
-                                    <li>{{ title.title }}{{ title.subtitle ? ' (' + title.subtitle + ')' : '' }}</li>
-                                }
-                            </ul>
-                        }
-                    </div>
-                }
-                @if (hasGlobalOptionEnabled) {
-                    <div>
-                        {{ 'Options' | translate }}:
-                        <ul>
-                            @if (poll.global_yes) {
-                                <li>{{ pollPropertyVerbose.global_yes | translate }}</li>
-                            }
-                            @if (poll.global_no) {
-                                <li>{{ pollPropertyVerbose.global_no | translate }}</li>
-                            }
-                            @if (poll.global_abstain) {
-                                <li>{{ pollPropertyVerbose.global_abstain | translate }}</li>
-                            }
-                        </ul>
-                    </div>
-                }
-            </os-expandable-content-wrapper>
-        </small>
-    }
-    @if (showStats) {
-        <div class="meta-info-right subtitle">
-            <!-- Groups who can vote -->
-            @if (poll.entitled_groups && poll.type && poll.type !== 'analog') {
-                <small>
-                    {{ 'Entitled to vote' | translate }}:
-                    <os-comma-separated-listing [list]="poll.entitled_groups">
-                        <ng-template let-group>{{ group.getTitle() }}</ng-template>
-                    </os-comma-separated-listing>
-                    <br />
-                </small>
-            }
-            <!-- Voting method -->
-            @if (poll.pollmethod) {
-                <small>
-                    <span>{{ 'Election method' | translate }}: {{ getVerbosePollMethod() | translate }}</span>
-                    <br />
-                </small>
-            }
-            <!-- Amount of Votes -->
-            @if (poll.max_votes_amount > 1) {
-                <small>
-                    @if (poll.max_votes_amount !== poll.min_votes_amount) {
-                        <span>{{ pollPropertyVerbose.min_votes_amount | translate }}: {{ poll.min_votes_amount }}</span>
-                        <br />
-                        <span>{{ pollPropertyVerbose.max_votes_amount | translate }}: {{ poll.max_votes_amount }}</span>
-                        <br />
-                    }
-                    @if (poll.max_votes_amount === poll.min_votes_amount) {
-                        <span>{{ 'Votes' | translate }}: {{ poll.max_votes_amount }}</span>
-                        <br />
-                    }
-                </small>
-            }
-            <!-- Max Votes per Option -->
-            @if (poll.max_votes_per_option > 1) {
-                <small>
-                    <span>
-                        {{ pollPropertyVerbose.max_votes_per_option | translate }}: {{ poll.max_votes_per_option }}
-                    </span>
-                    <br />
-                </small>
-            }
-            <!-- 100% base -->
-            @if (poll.onehundred_percent_base) {
-                <small>{{ '100% base' | translate }}: {{ poll.percentBaseVerbose | translate }}</small>
-                <br />
-            }
-            <!-- Poll backend duration type -->
-            @if (poll.backend) {
-                <small>
-                    {{ 'Voting duration' | translate }}: {{ POLL_BACKEND_DURATION_LABEL[poll.backend] | translate }}
-                </small>
-            }
-        </div>
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.spec.ts
deleted file mode 100644
index e09b56449d..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssignmentPollMetaInfoComponent } from './assignment-poll-meta-info.component';
-
-xdescribe(`AssignmentPollMetaInfoComponent`, () => {
-    let component: AssignmentPollMetaInfoComponent;
-    let fixture: ComponentFixture<AssignmentPollMetaInfoComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [AssignmentPollMetaInfoComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(AssignmentPollMetaInfoComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.ts
deleted file mode 100644
index 7cc05bba24..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-meta-info/assignment-poll-meta-info.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { PollPropertyVerbose } from 'src/app/domain/models/poll/poll-constants';
-import { BasePollMetaInformationComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component';
-import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
-
-import { AssignmentPollMethodVerbose } from '../../definitions';
-
-@Component({
-    selector: `os-assignment-poll-meta-info`,
-    templateUrl: `./assignment-poll-meta-info.component.html`,
-    styleUrls: [`./assignment-poll-meta-info.component.scss`],
-    standalone: false
-})
-export class AssignmentPollMetaInfoComponent extends BasePollMetaInformationComponent {
-    public pollPropertyVerbose = PollPropertyVerbose;
-
-    @Input()
-    public showCandidates = true;
-
-    @Input()
-    public showStats = true;
-
-    @Input()
-    public shortenList = false;
-
-    private get assignment(): ViewAssignment {
-        return this.poll.content_object;
-    }
-
-    public get enumerateCandidates(): boolean {
-        return this.assignment?.number_poll_candidates || false;
-    }
-
-    public get hasGlobalOptionEnabled(): boolean {
-        return this.poll.hasGlobalOptionEnabled;
-    }
-
-    public userCanVote(): boolean {
-        return this.poll.canBeVotedFor();
-    }
-
-    public getOptionTitle(option: ViewOption): string {
-        return option.getOptionTitle().title;
-    }
-
-    public getVerbosePollMethod(): string {
-        return AssignmentPollMethodVerbose[
-            this.poll.isListPoll ? this.poll.pollmethod.toLowerCase() : this.poll.pollmethod
-        ];
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.spec.ts
deleted file mode 100644
index fba78f1ec7..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssignmentPollVoteComponent } from './assignment-poll-vote.component';
-
-xdescribe(`AssignmentPollVoteComponent`, () => {
-    let component: AssignmentPollVoteComponent;
-    let fixture: ComponentFixture<AssignmentPollVoteComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [AssignmentPollVoteComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(AssignmentPollVoteComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.ts
deleted file mode 100644
index 3823458cd9..0000000000
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll-vote/assignment-poll-vote.component.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { _ } from '@ngx-translate/core';
-import { PollMethod } from 'src/app/domain/models/poll/poll-constants';
-import { VoteValue } from 'src/app/domain/models/poll/vote-constants';
-import {
-    BasePollVoteComponent,
-    VoteOption
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component';
-import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-import { PromptService } from 'src/app/ui/modules/prompt-dialog';
-
-import { UnknownUserLabel } from '../../services/assignment-poll.service';
-
-@Component({
-    selector: `os-assignment-poll-vote`,
-    templateUrl: `../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.html`,
-    styleUrls: [`../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
-})
-export class AssignmentPollVoteComponent extends BasePollVoteComponent<ViewAssignment> {
-    public unknownUserLabel = UnknownUserLabel;
-    public AssignmentPollMethod = PollMethod;
-
-    public override get pollHint(): string | null {
-        if (this.poll?.content_object) {
-            return this.poll.content_object!.default_poll_description;
-        }
-        return null;
-    }
-
-    public override readonly maxVotesPerOptionSuffix = _(`votes per candidate`);
-
-    public override readonly optionPluralLabel: string = _(`Candidates`);
-
-    private get assignment(): ViewAssignment {
-        return this.poll.content_object;
-    }
-
-    public get enumerateCandidates(): boolean {
-        return this.assignment?.number_poll_candidates || false;
-    }
-
-    public constructor(
-        private promptService: PromptService,
-        meetingSettingsService: MeetingSettingsService
-    ) {
-        super(meetingSettingsService);
-    }
-
-    public getActionButtonClass(actions: VoteOption, option: ViewOption, user: ViewUser = this.user): string {
-        if (
-            this.voteRequestData[user?.id]?.value[option.id] === actions.vote ||
-            this.voteRequestData[user?.id]?.value[option.id] === 1
-        ) {
-            return actions.css!;
-        }
-        return ``;
-    }
-
-    public override async submitVote(user: ViewUser = this.user): Promise<void> {
-        const value = this.voteRequestData[user.id].value;
-        if (this.poll.isMethodY && this.poll.max_votes_per_option > 1 && this.isErrorInVoteEntry()) {
-            this.raiseError(this.translate.instant(`There is an error in your vote.`));
-            return;
-        }
-        const title = this.translate.instant(`Submit selection now?`);
-        let content = this.translate.instant(`Your decision cannot be changed afterwards.`);
-        if (this.poll.max_votes_amount > 1 && !this.isGlobalOptionSelected()) {
-            content =
-                this.translate.instant(`Your votes`) +
-                `: ${this.getVotesCount(user)}/${this.poll.max_votes_amount}<br>` +
-                content;
-        }
-        const confirmed = await this.promptService.openSafe(title, content);
-        if (confirmed) {
-            await super.submitVote(user, value);
-        }
-    }
-
-    public saveSingleVote(optionId: number, vote?: VoteValue, user: ViewUser = this.user): void {
-        if (!this.voteRequestData[user.id]) {
-            throw new Error(`The user for your voting request does not exist`);
-        }
-
-        if (this.isGlobalOptionSelected(user)) {
-            this.voteRequestData[user.id].value = {};
-        }
-
-        if (this.poll.isMethodY || this.poll.isMethodN) {
-            const maxVotesAmount = this.poll.max_votes_amount;
-            const tmpVoteRequest = this.poll.options
-                .map(option => option.id)
-                .reduce((o: any, n) => {
-                    o[n] = 0;
-                    if (maxVotesAmount === 1) {
-                        if (n === optionId && this.voteRequestData[user.id].value[n] !== 1) {
-                            o[n] = 1;
-                        }
-                    } else if ((n === optionId) !== (this.voteRequestData[user.id].value[n] === 1)) {
-                        o[n] = 1;
-                    }
-
-                    return o;
-                }, {});
-
-            // check if you can still vote
-            const countedVotes = Object.keys(tmpVoteRequest).filter(key => tmpVoteRequest[key]).length;
-            if (countedVotes <= maxVotesAmount) {
-                this.voteRequestData[user.id].value = tmpVoteRequest;
-
-                // if you have no options anymore, try to send
-                if (this.getVotesCount(user) === maxVotesAmount) {
-                    this.submitVote(user);
-                }
-            } else {
-                this.raiseError(
-                    this.translate.instant(`You reached the maximum amount of votes. Deselect somebody first.`)
-                );
-            }
-        } else {
-            // YN/YNA
-            if (
-                this.voteRequestData[user.id].value[optionId] &&
-                this.voteRequestData[user.id].value[optionId] === vote
-            ) {
-                delete (this.voteRequestData[user.id] as any).value[optionId];
-            } else {
-                (this.voteRequestData[user.id] as any).value[optionId] = vote;
-            }
-            const maxVotesAmount = this.poll.max_votes_amount;
-            const countedVotes = Object.keys(this.voteRequestData[user.id].value).length;
-            if (countedVotes <= maxVotesAmount) {
-                if (this.getVotesCount(user) === maxVotesAmount) {
-                    this.submitVote(user);
-                }
-            } else {
-                this.raiseError(
-                    this.translate.instant(`You reached the maximum amount of votes. Deselect somebody first.`)
-                );
-                delete (this.voteRequestData[user.id] as any).value[optionId];
-            }
-        }
-    }
-
-    public override shouldStrikeOptionText(option: ViewOption, user: ViewUser = this.user): boolean {
-        if (this.poll.pollmethod === PollMethod.N) {
-            return !!this.voteRequestData[user.id].value[option.id];
-        }
-        return false;
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.html b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.html
index e2cc6cfd2c..cd01089427 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.html
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.html
@@ -1,135 +1,7 @@
 @if (showPoll) {
     <mat-card class="os-card">
         <mat-card-content>
-            <div class="assignment-poll-wrapper">
-                <div>
-                    <!-- Title -->
-                    <mat-card-title>
-                        <a [routerLink]="getDetailLink()">
-                            {{ poll.title }}
-                        </a>
-                    </mat-card-title>
-                    <!-- Type and State -->
-                    <div class="type-and-state italic spacer-bottom-20">
-                        <span *osPerms="permission.assignmentCanManagePolls; and: poll.isEVoting">
-                            <os-icon-container
-                                class="poll-type"
-                                color="primary"
-                                icon="info"
-                                size="large"
-                                [showIcon]="poll.isAnonymous"
-                                [swap]="true"
-                                (iconAction)="openVotingWarning()"
-                            >
-                                {{ poll.typeVerbose | translate }}
-                            </os-icon-container>
-                            @if (poll.isAnonymous) {
-                                <span>&nbsp;</span>
-                            }
-                            &middot;&nbsp;
-                        </span>
-                        <span class="break-word">
-                            @if (isAnonymous && poll.canBeVotedFor()) {
-                                {{ 'Voting in progress' | translate }}
-                            } @else {
-                                {{ poll.stateVerbose | translate }}
-                            }
-                        </span>
-                    </div>
-                    <!-- Menu -->
-                    <div class="poll-menu">
-                        <!-- Buttons -->
-                        <button
-                            *osPerms="[permission.projectorCanManage, permission.assignmentCanManagePolls]"
-                            mat-icon-button
-                            [matMenuTriggerFor]="pollItemMenu"
-                            (click)="$event.stopPropagation()"
-                        >
-                            <mat-icon>more_horiz</mat-icon>
-                        </button>
-                    </div>
-                    <!-- Change state button -->
-                    <div *osPerms="permission.assignmentCanManagePolls; and: !hideChangeState">
-                        @if (pollStateActions[poll.state]) {
-                            <button
-                                mat-stroked-button
-                                [disabled]="stateChangePendingObservable | async"
-                                [ngClass]="pollStateActions[poll.state].css"
-                                (click)="nextPollState()"
-                            >
-                                <mat-icon>{{ pollStateActions[poll.state]?.icon }}</mat-icon>
-                                <span class="next-state-label">
-                                    @if ((stateChangePendingObservable | async) === false) {
-                                        {{ poll.nextStateActionVerbose | translate }}
-                                    }
-                                    @if (stateChangePendingObservable | async) {
-                                        {{ 'In progress, please wait ...' | translate }}
-                                    }
-                                </span>
-                            </button>
-                        }
-                    </div>
-                    <!-- Enter Votes Hint -->
-                    <div *osPerms="permission.assignmentCanManagePolls; and: poll.isAnalog && !poll.stateHasVotes">
-                        {{ 'Edit to enter votes.' | translate }}
-                    </div>
-                </div>
-                <!-- Chart / Table -->
-                @if (poll.stateHasVotes) {
-                    <div class="poll-result-wrapper" tabindex="-1" [routerLink]="getDetailLink()">
-                        <os-assignment-poll-detail-content [poll]="poll"></os-assignment-poll-detail-content>
-                    </div>
-                }
-                <!-- Poll progress bar -->
-                @if (poll && poll.isStarted) {
-                    <os-poll-progress [canManagePoll]="canManagePoll" [poll]="poll"></os-poll-progress>
-                }
-                <!-- The Vote -->
-                @if (poll.canBeVotedFor()) {
-                    <os-assignment-poll-vote [poll]="poll"></os-assignment-poll-vote>
-                }
-                <!-- Meta-Info -->
-                @if (showMetaInfo || poll.isListPoll) {
-                    <os-assignment-poll-meta-info
-                        [poll]="poll"
-                        [shortenList]="poll.isListPoll && !poll.canBeVotedFor()"
-                        [showCandidates]="showCandidatesInMetaInfo"
-                        [showStats]="showMetaInfo"
-                    ></os-assignment-poll-meta-info>
-                }
-            </div>
+            <os-poll [poll]="poll"></os-poll>
         </mat-card-content>
     </mat-card>
 }
-
-<mat-menu #pollItemMenu="matMenu">
-    <div *osPerms="permission.assignmentCanManagePolls">
-        <button mat-menu-item (click)="dialogOpened.emit()">
-            <mat-icon>edit</mat-icon>
-            <span>{{ 'Edit' | translate }}</span>
-        </button>
-    </div>
-    <div *osPerms="permission.projectorCanManage">
-        <os-projector-button [menuItem]="true" [object]="poll"></os-projector-button>
-    </div>
-    <div *osPerms="permission.assignmentCanManagePolls">
-        <button mat-menu-item (click)="printBallot()">
-            <mat-icon>picture_as_pdf</mat-icon>
-            <span>{{ 'Ballot papers' | translate }}</span>
-        </button>
-
-        <mat-divider></mat-divider>
-
-        <!-- Reset Button -->
-        <button mat-menu-item (click)="resetState()">
-            <mat-icon color="warn">replay</mat-icon>
-            <span>{{ 'Reset state' | translate }}</span>
-        </button>
-
-        <!-- Delete button -->
-        <button class="red-warning-text" mat-menu-item (click)="deletePoll()">
-            <mat-icon>delete</mat-icon>
-            <span>{{ 'Delete' | translate }}</span>
-        </button>
-    </div>
-</mat-menu>
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.ts
index 96865edb48..4bb922b358 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.ts
@@ -1,22 +1,23 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { TranslateService } from '@ngx-translate/core';
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { MatCardModule } from '@angular/material/card';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatIconModule } from '@angular/material/icon';
+import { MatMenuModule } from '@angular/material/menu';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { BasePollComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll.component';
-import { VotingService } from 'src/app/site/pages/meetings/modules/poll/services/voting.service';
+import { PollComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll/poll.component';
 import { OperatorService } from 'src/app/site/services/operator.service';
-
-import { VotingPrivacyWarningDialogService } from '../../../../../../modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service';
-import { AssignmentPollPdfService } from '../../services/assignment-poll-pdf.service/assignment-poll-pdf.service';
+import { DirectivesModule } from 'src/app/ui/directives';
 
 @Component({
     selector: `os-assignment-poll`,
     templateUrl: `./assignment-poll.component.html`,
     styleUrls: [`./assignment-poll.component.scss`],
-    standalone: false
+    imports: [PollComponent, DirectivesModule, MatCardModule, MatMenuModule, MatIconModule, MatDividerModule]
 })
-export class AssignmentPollComponent extends BasePollComponent implements OnInit {
+export class AssignmentPollComponent extends BasePollComponent {
+    // TODO: Use signals
     @Input()
     public set pollId(id: Id) {
         this.initializePoll(id);
@@ -25,20 +26,6 @@ export class AssignmentPollComponent extends BasePollComponent implements OnInit
     @Output()
     public readonly dialogOpened = new EventEmitter<void>();
 
-    public candidatesLabels: string[] = [];
-
-    /**
-     * Form for updating the poll's description
-     */
-    public descriptionForm!: UntypedFormGroup;
-
-    /**
-     * @returns true if the description on the form differs from the poll's description
-     */
-    public get dirtyDescription(): boolean {
-        return this.descriptionForm.get(`description`)?.value !== this.poll.description;
-    }
-
     public get showPoll(): boolean {
         if (this.poll) {
             if (
@@ -52,55 +39,9 @@ export class AssignmentPollComponent extends BasePollComponent implements OnInit
         return false;
     }
 
-    public get showMetaInfo(): boolean {
-        return !this.poll.stateHasVotes && this.operator.hasPerms(Permission.assignmentCanManagePolls);
-    }
-
-    public get showCandidatesInMetaInfo(): boolean {
-        return (!this.poll.stateHasVotes && !this.votingService.canVote(this.poll)) || this.poll.isListPoll;
-    }
-
-    public get canManagePoll(): boolean {
-        return this.operator.hasPerms(Permission.assignmentCanManagePolls);
-    }
-
-    public get isAnonymous(): boolean {
-        return this.operator.isAnonymousLoggedIn;
-    }
-
-    public constructor(
-        protected override translate: TranslateService,
-        private formBuilder: UntypedFormBuilder,
-        private pdfService: AssignmentPollPdfService,
-        private operator: OperatorService,
-        private votingService: VotingService,
-        private votingPrivacyDialog: VotingPrivacyWarningDialogService
-    ) {
-        super();
-    }
-
-    public ngOnInit(): void {
-        this.descriptionForm = this.formBuilder.group({
-            description: this.poll ? this.poll.description : ``
-        });
-    }
-
-    /**
-     * Print the PDF of this poll with the corresponding options and numbers
-     */
-    public printBallot(): void {
-        try {
-            this.pdfService.printBallots(this.poll);
-        } catch (e: any) {
-            console.error(e);
-            this.raiseError(e);
-        }
-    }
-
-    public openVotingWarning(): void {
-        this.votingPrivacyDialog.open();
-    }
+    private operator = inject(OperatorService);
 
+    // TODO: Maybe remove
     public getDetailLink(): string {
         return `/${this.poll.meeting_id}/assignments/polls/${this.poll.sequential_number}`;
     }
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts
index ffac7b1df1..32cb9f4cf2 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { PollMethod } from 'src/app/domain/models/poll/poll-constants';
 import {
     AbstractPollData,
     BasePollPdfService
@@ -94,7 +93,8 @@ export class AssignmentPollPdfService extends BasePollPdfService {
         };
     }
 
-    private createOptionFields(poll: ViewPoll): object {
+    private createOptionFields(_poll: ViewPoll): object {
+        /*
         const options = poll.options.sort((a, b) => a.weight - b.weight);
         const resultObject = options.map(opt => {
             let optionName = ``;
@@ -132,9 +132,12 @@ export class AssignmentPollPdfService extends BasePollPdfService {
             }
         }
         return resultObject;
+        */
+
+        return {};
     }
 
-    private createYNBallotEntry(option: string, method: PollMethod): object {
+    private createYNBallotEntry(option: string, method: any): object {
         const choices = method === `YNA` ? [`Yes`, `No`, `Abstain`] : [`Yes`, `No`];
         const columnstack = choices.map(choice => ({
             width: `auto`,
diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
index fb461357e9..bf7dea9c79 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
@@ -2,25 +2,14 @@ import { Injectable } from '@angular/core';
 import { _ } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Assignment } from 'src/app/domain/models/assignments/assignment';
-import { PollPercentBaseVerboseKey, PollTypeVerboseKey } from 'src/app/domain/models/poll';
-import { OptionData, PollData } from 'src/app/domain/models/poll/generic-poll';
+import { PollVisibility } from 'src/app/domain/models/poll';
 import { Poll } from 'src/app/domain/models/poll/poll';
-import {
-    ABSTAIN_KEY,
-    CalculablePollKey,
-    NO_KEY,
-    PollMethod,
-    PollPercentBase,
-    PollType,
-    YES_KEY
-} from 'src/app/domain/models/poll/poll-constants';
+import { BaseOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-types';
 import { PollServiceMapperService } from 'src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service';
 import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 
 import { PollService } from '../../../../../modules/poll/services/poll.service/poll.service';
 import { PollControllerService } from '../../../../../modules/poll/services/poll-controller.service/poll-controller.service';
-import { AssignmentPollMethodKey, AssignmentPollMethodVerbose } from '../definitions';
 import { AssignmentPollServiceModule } from './assignment-poll-service.module';
 
 export const UnknownUserLabel = _(`Deleted user`);
@@ -32,16 +21,14 @@ export const UnknownUserLabel = _(`Deleted user`);
  */
 @Injectable({ providedIn: AssignmentPollServiceModule })
 export class AssignmentPollService extends PollService {
-    public defaultPollMethod: PollMethod | undefined;
-    public defaultPercentBase: PollPercentBase | undefined;
-    public defaultPollType: PollType | undefined;
+    public defaultPercentBase: BaseOnehundredPercentBase | undefined;
+    public defaultPollType: PollVisibility | undefined;
     public defaultGroupIds: number[] = [];
 
     public constructor(
         pollServiceMapper: PollServiceMapperService,
         protected override translate: TranslateService,
-        private pollRepo: PollControllerService,
-        private meetingSettingsService: MeetingSettingsService
+        private pollRepo: PollControllerService
     ) {
         super();
         pollServiceMapper.registerService(ViewAssignment.COLLECTION, this);
@@ -51,12 +38,6 @@ export class AssignmentPollService extends PollService {
         this.meetingSettingsService
             .get(`assignment_poll_default_group_ids`)
             .subscribe(ids => (this.defaultGroupIds = ids));
-        this.meetingSettingsService
-            .get(`assignment_poll_default_method`)
-            .subscribe(method => (this.defaultPollMethod = method));
-        this.meetingSettingsService
-            .get(`assignment_poll_default_type`)
-            .subscribe(type => (this.defaultPollType = type));
         this.meetingSettingsService
             .get(`assignment_poll_sort_poll_result_by_votes`)
             .subscribe(sort => (this.sortByVote = sort));
@@ -68,10 +49,12 @@ export class AssignmentPollService extends PollService {
     public getDefaultPollData(contentObject?: Assignment): Partial<Poll> {
         const poll: Partial<Poll> = {
             title: this.translate.instant(`Ballot`),
-            onehundred_percent_base: this.defaultPercentBase,
+            // onehundred_percent_base: this.defaultPercentBase,
+            // pollmethod: this.defaultPollMethod,
             entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
-            pollmethod: this.defaultPollMethod,
-            type: this.isElectronicVotingEnabled ? this.defaultPollType : PollType.Analog
+            visibility: this.isElectronicVotingEnabled
+                ? (this.defaultPollType as unknown as PollVisibility)
+                : PollVisibility.Manually
         };
 
         if (contentObject) {
@@ -83,57 +66,4 @@ export class AssignmentPollService extends PollService {
 
         return poll;
     }
-
-    /**
-     * @deprecated Please rewrite this function
-     *
-     * @param key
-     * @param value
-     * @returns
-     */
-    public override getVerboseNameForValue(key: string, value: PollPercentBaseVerboseKey | PollTypeVerboseKey): string {
-        switch (key) {
-            case `pollmethod`:
-                if (value in AssignmentPollMethodVerbose) {
-                    return AssignmentPollMethodVerbose[value as AssignmentPollMethodKey];
-                }
-        }
-        return super.getVerboseNameForValue(key, value);
-    }
-
-    protected override getPollDataFields(poll: PollData): CalculablePollKey[] {
-        switch (poll.pollmethod) {
-            case PollMethod.YNA: {
-                return [YES_KEY, NO_KEY, ABSTAIN_KEY];
-            }
-            case PollMethod.YN: {
-                return [YES_KEY, NO_KEY];
-            }
-            case PollMethod.N: {
-                return [NO_KEY];
-            }
-            default: {
-                return [YES_KEY];
-            }
-        }
-    }
-
-    protected override getPercentBase(poll: PollData, row?: OptionData): number {
-        const base = poll.onehundred_percent_base as PollPercentBase;
-        switch (base) {
-            case PollPercentBase.Y:
-                return this.getSumOptionsY(poll);
-            default:
-                return super.getPercentBase(poll, row);
-        }
-    }
-
-    private getSumOptionsY(poll: PollData): number {
-        if (!poll.options?.length) {
-            return 0;
-        }
-
-        const generalOptions = (poll.global_option.abstain || 0) + (poll.global_option.no || 0);
-        return poll.votesvalid - generalOptions;
-    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.html b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.html
index 6f50b451a8..0b73a42c83 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.html
@@ -93,11 +93,13 @@ <h1 class="mock-h2">
                     }
                     <!-- New Ballot button -->
                     @if (assignment && assignment.candidatesAsUsers.length && hasPerms('createPoll')) {
-                        <div class="new-ballot-button">
-                            <button mat-stroked-button (click)="openDialog()">
-                                <mat-icon>add</mat-icon>
-                                <span>{{ 'New ballot' | translate }}</span>
-                            </button>
+                        <div class="new-ballot-button-container">
+                            <div class="new-ballot-button">
+                                <button mat-stroked-button (click)="openDialog()">
+                                    <mat-icon>add</mat-icon>
+                                    <span>{{ 'New ballot' | translate }}</span>
+                                </button>
+                            </div>
                         </div>
                     }
                     <!-- candidates list -->
diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss
index b8b9429c10..ebcb487494 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss
+++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss
@@ -35,7 +35,7 @@ mat-card mat-card-content h3 {
     }
 }
 
-.new-ballot-button {
+.new-ballot-button-container {
     display: flex;
     > * {
         margin-left: auto;
@@ -43,6 +43,14 @@ mat-card mat-card-content h3 {
     }
 }
 
+.new-ballot-button {
+    display: flex;
+    align-items: center;
+    .menu-button {
+        margin-left: 8px;
+    }
+}
+
 .election-document-list mat-list-item {
     height: auto;
     height: max-content !important;
diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
index 47c9551725..9b546522a2 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
@@ -316,7 +316,7 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
     }
 
     /**
-     * Creates a new Poll
+     * Updates an existing Poll
      */
     public openDialog(pollId?: Id): void {
         this.pollDialog.open(this.getDialogData(pollId));
@@ -459,7 +459,7 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
                 content_object_id: this.assignment.fqid,
                 content_object: this.assignment,
                 ...this.assignmentPollService.getDefaultPollData(this.assignment)
-            } as PollDialogData;
+            } as unknown as PollDialogData;
         }
     }
 
diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.html b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.html
index 5bd061a987..eba18d90a4 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.html
@@ -27,12 +27,12 @@ <h1 class="mock-h2">{{ poll.title }}</h1>
             <h1>{{ poll.title }}</h1>
             <div>
                 <!-- Voting type -->
-                @if (poll.type !== 'analog') {
+                @if (!poll.isAnalog) {
                     <span>{{ poll.typeVerbose | translate }} &middot;</span>
                 }
                 <!-- State -->
                 <span>
-                    {{ poll.stateVerbose | translate }}
+                    {{ poll.state | translateKey: 'poll_state' }}
                 </span>
             </div>
             @if (poll) {
@@ -40,7 +40,7 @@ <h1>{{ poll.title }}</h1>
                     <!-- Result -->
                     <os-assignment-poll-detail-content [poll]="poll"></os-assignment-poll-detail-content>
                     @if (poll.isStarted) {
-                        <os-poll-progress [canManagePoll]="canManagePoll" [poll]="poll"></os-poll-progress>
+                        <os-poll-progress [poll]="poll"></os-poll-progress>
                         <div *osPerms="permission.pollCanManage" class="poll-content">
                             <div class="user-subtitle">
                                 {{ 'Present entitled users' | translate }}:
@@ -96,8 +96,7 @@ <h1>{{ poll.title }}</h1>
         </div>
     }
 
-    <!-- Meta Infos -->
-    <os-assignment-poll-meta-info [poll]="poll" />
+    <!-- TODO: Meta Infos -->
 </ng-template>
 
 <!-- More Menu -->
@@ -108,10 +107,7 @@ <h1>{{ poll.title }}</h1>
         <span>{{ 'Edit' | translate }}</span>
     </button>
     <button
-        *osPerms="
-            permission.assignmentCanManagePolls;
-            and: poll && poll.type === 'named' && (poll.isFinished || poll.isPublished) && !poll.is_pseudoanonymized
-        "
+        *osPerms="permission.assignmentCanManagePolls; and: poll && poll.canAnonymize"
         mat-menu-item
         (click)="pseudoanonymizePoll()"
     >
diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.ts
index 2b487cf263..a51294f407 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/components/assignment-poll-detail/assignment-poll-detail.component.ts
@@ -6,7 +6,7 @@ import {
     BaseVoteData
 } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component';
 import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments';
-import { ViewOption, ViewPoll, ViewVote } from 'src/app/site/pages/meetings/pages/polls';
+import { ViewBallot, ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 
 import { isSortedList, SortedList } from '../../../../../polls/view-models/sorted-list';
@@ -19,7 +19,9 @@ import { AssignmentPollPdfService } from '../../../../modules/assignment-poll/se
 
 @Component({
     selector: `os-assignment-poll-detail`,
-    templateUrl: `./assignment-poll-detail.component.html`,
+    template: `
+        TODO
+    `,
     styleUrls: [`./assignment-poll-detail.component.scss`],
     changeDetection: ChangeDetectionStrategy.OnPush,
     encapsulation: ViewEncapsulation.None,
@@ -66,6 +68,7 @@ export class AssignmentPollDetailComponent
     }
 
     protected createVotesData(): BaseVoteData[] {
+        /*
         const votes: any = {};
         const pollOptions: ViewOption<ViewAssignment>[] = this.poll.options;
         for (const option of pollOptions) {
@@ -109,6 +112,9 @@ export class AssignmentPollDetailComponent
             }
         }
         return Object.values(votes);
+        */
+
+        return [];
     }
 
     protected override onAfterSetVotesData(): void {
@@ -137,8 +143,8 @@ export class AssignmentPollDetailComponent
         }
     }
 
-    private getMethodYVoteLabel(vote: ViewVote, optionContent: ViewUser | SortedList): string {
-        if (this.poll.max_votes_per_option > 1) {
+    private getMethodYVoteLabel(vote: ViewBallot, optionContent: ViewUser | SortedList): string {
+        if (this.poll.config?.max_votes_per_option > 1) {
             // Show how often the option was selected
             return Math.floor(vote.weight).toString() + `x ` + this.getFullTitle(optionContent);
         } else {
diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts
index e32f94ca3d..324c5c5229 100644
--- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts
+++ b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts
@@ -2,7 +2,8 @@ import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Content, ContentColumns, ContentText } from 'pdfmake/interfaces';
 import { AssignmentPhase } from 'src/app/domain/models/assignments/assignment-phase';
-import { PollMethod, PollTableData, VotingResult } from 'src/app/domain/models/poll/poll-constants';
+import { PollConfigSelection } from 'src/app/domain/models/poll/poll-config-selection';
+import { PollTableData, VotingResult } from 'src/app/domain/models/poll/poll-constants';
 import { HtmlToPdfService } from 'src/app/gateways/export/html-to-pdf.service';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 
@@ -251,9 +252,9 @@ export class AssignmentPdfService {
     private getPollResult(votingResult: PollTableData, poll: ViewPoll): string {
         const resultList = votingResult.value
             .filter((singleResult: VotingResult) => {
-                if (poll.pollmethod === PollMethod.Y) {
+                if (poll.config instanceof PollConfigSelection) {
                     return singleResult.vote !== `no` && singleResult.vote !== `abstain`;
-                } else if (poll.pollmethod === PollMethod.YN) {
+                } else if (!poll.config?.allow_abstain) {
                     return singleResult.vote !== `abstain`;
                 } else {
                     return true;
diff --git a/client/src/app/site/pages/meetings/pages/autopilot/autopilot.module.ts b/client/src/app/site/pages/meetings/pages/autopilot/autopilot.module.ts
index 8d26a94001..f99c75e041 100644
--- a/client/src/app/site/pages/meetings/pages/autopilot/autopilot.module.ts
+++ b/client/src/app/site/pages/meetings/pages/autopilot/autopilot.module.ts
@@ -34,7 +34,7 @@ import { AutopilotSettingsComponent } from './components/autopilot-settings/auto
 import { PollCollectionComponent } from './components/poll-collection/poll-collection.component';
 
 @NgModule({
-    declarations: [AutopilotMainComponent, AutopilotSettingsComponent, AutopilotComponent, PollCollectionComponent],
+    declarations: [AutopilotMainComponent, AutopilotSettingsComponent, AutopilotComponent],
     imports: [
         CommonModule,
         RouterModule,
@@ -58,6 +58,7 @@ import { PollCollectionComponent } from './components/poll-collection/poll-colle
         CountdownTimeModule,
         OpenSlidesTranslationModule.forChild(),
         PollModule,
+        PollCollectionComponent,
         MotionPollModule,
         MatMenuModule,
         TopicPollModule,
diff --git a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html
index fd41f32a9f..17952f4e4d 100644
--- a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html
+++ b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.html
@@ -10,70 +10,7 @@
 <ng-template #pollArea let-last="last" let-poll="poll">
     <mat-card class="os-card">
         <mat-card-content>
-            <a class="subtitle-text" [routerLink]="poll.getDetailStateUrl()" [state]="{ back: 'true' }">
-                <h2 class="accessibility-h2 accessibility-h2-1 accessibility-h2-2">
-                    {{ getPollVoteTitle(poll) }}
-                </h2>
-            </a>
-            @if (canManagePoll(poll) && poll.isFinished) {
-                <i class="small">
-                    {{ 'finished (unpublished)' | translate }}
-                </i>
-            }
-
-            @if (poll.canBeVotedFor()) {
-                <div class="type-and-state italic spacer-bottom-20 break-word">
-                    <!-- State -->
-                    <i>
-                        {{ 'Voting in progress' | translate }}
-                    </i>
-                </div>
-
-                <os-poll-progress [poll]="poll"></os-poll-progress>
-            }
-            @if (poll.isMotionPoll) {
-                <div>
-                    @if (poll.canBeVotedFor() && !last) {
-                        <os-motion-poll-vote
-                            [displayInAutopilot]="displayInAutopilot"
-                            [poll]="poll"
-                        ></os-motion-poll-vote>
-                    }
-                    @if (last) {
-                        <os-motion-poll-detail-content [poll]="lastPublishedPoll"></os-motion-poll-detail-content>
-                    }
-                </div>
-            }
-            @if (poll.isAssignmentPoll) {
-                <div>
-                    @if (poll.canBeVotedFor() && !last) {
-                        <os-assignment-poll-vote [poll]="poll"></os-assignment-poll-vote>
-                    }
-                    @if (last) {
-                        <os-assignment-poll-detail-content
-                            [poll]="lastPublishedPoll"
-                        ></os-assignment-poll-detail-content>
-                    }
-                    @if (poll.isListPoll) {
-                        <os-assignment-poll-meta-info
-                            [poll]="poll"
-                            [shortenList]="true"
-                            [showCandidates]="poll.isListPoll"
-                            [showStats]="false"
-                        ></os-assignment-poll-meta-info>
-                    }
-                </div>
-            }
-            @if (poll.isTopicPoll) {
-                <div>
-                    @if (poll.canBeVotedFor() && !last) {
-                        <os-topic-poll-vote [poll]="poll"></os-topic-poll-vote>
-                    }
-                    @if (last) {
-                        <os-topic-poll-detail-content [poll]="lastPublishedPoll"></os-topic-poll-detail-content>
-                    }
-                </div>
-            }
+            <os-poll [poll]="poll" />
         </mat-card-content>
     </mat-card>
 </ng-template>
diff --git a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts
index 013dd8aae7..ffddb1b65f 100644
--- a/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts
+++ b/client/src/app/site/pages/meetings/pages/autopilot/components/poll-collection/poll-collection.component.ts
@@ -1,10 +1,11 @@
+import { NgTemplateOutlet } from '@angular/common';
 import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { MatCardModule } from '@angular/material/card';
 import { TranslateService } from '@ngx-translate/core';
 import { map } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Assignment } from 'src/app/domain/models/assignments/assignment';
 import { PollContentObject } from 'src/app/domain/models/poll';
-import { PollClassType } from 'src/app/domain/models/poll/poll-constants';
 import { Topic } from 'src/app/domain/models/topics/topic';
 import { BaseComponent } from 'src/app/site/base/base.component';
 import { BaseViewModel } from 'src/app/site/base/base-view-model';
@@ -12,6 +13,7 @@ import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 import { OperatorService } from 'src/app/site/services/operator.service';
 
+import { PollComponent } from '../../../../modules/poll/components/poll/poll.component';
 import { getPollDetailSubscriptionConfig, POLL_DETAIL_SUBSCRIPTION } from '../../../polls/polls.subscription';
 import { HasPolls, isHavingViewPolls } from '../../../polls/view-models/has-polls';
 
@@ -19,7 +21,7 @@ import { HasPolls, isHavingViewPolls } from '../../../polls/view-models/has-poll
     selector: `os-poll-collection`,
     templateUrl: `./poll-collection.component.html`,
     styleUrls: [`./poll-collection.component.scss`],
-    standalone: false
+    imports: [MatCardModule, NgTemplateOutlet, PollComponent]
 })
 export class PollCollectionComponent<C extends PollContentObject> extends BaseComponent implements OnInit, OnDestroy {
     public polls: ViewPoll[] = [];
@@ -128,11 +130,11 @@ export class PollCollectionComponent<C extends PollContentObject> extends BaseCo
      * @param poll
      */
     public canManagePoll(poll: ViewPoll): boolean {
-        if (poll.pollClassType === PollClassType.Motion) {
+        if (poll.isMotionPoll) {
             return this.operator.hasPerms(this.permission.motionCanManagePolls);
-        } else if (poll.pollClassType === PollClassType.Assignment) {
+        } else if (poll.isAssignmentPoll) {
             return this.operator.hasPerms(this.permission.assignmentCanManagePolls);
-        } else if (poll.pollClassType === PollClassType.Topic) {
+        } else if (poll.isTopicPoll) {
             return this.operator.hasPerms(this.permission.pollCanManage);
         }
         return false;
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.html
index 03e6438364..e00e010390 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.html
@@ -1,9 +1,7 @@
 @if (poll) {
     <div
-        [ngClass]="{
-            'result-wrapper-wrapper': iconSize !== 'medium' && !inSlide,
-            'result-wrapper-wrapper-in-slide': inSlide
-        }"
+        [class.result-wrapper-wrapper]="iconSize !== 'medium' && !inSlide"
+        [class.result-wrapper-wrapper-in-slide]="inSlide"
     >
         <ng-content></ng-content>
         <div class="result-wrapper">
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts
index 2f2747ea62..85497d6546 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts
@@ -1,15 +1,16 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { combineLatestWith, map } from 'rxjs';
+import { TranslatePipe } from '@ngx-translate/core';
 import { Permission } from 'src/app/domain/definitions/permission';
 import { VOTE_UNDOCUMENTED } from 'src/app/domain/models/poll';
-import { PollData } from 'src/app/domain/models/poll/generic-poll';
 import { PollState, PollTableData } from 'src/app/domain/models/poll/poll-constants';
 import { ChartData } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component';
+import { SingleOptionChartTableComponent } from 'src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component';
 import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { ThemeService } from 'src/app/site/services/theme.service';
 import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
+import { ViewPoll } from '../../../../../polls';
 import { MotionPollService } from '../../services';
 
 const CHART_DATA_SUBSCRIPTION_NAME = `chart_data_subscription`;
@@ -17,12 +18,12 @@ const CHART_DATA_SUBSCRIPTION_NAME = `chart_data_subscription`;
 @Component({
     selector: `os-motion-poll-detail-content`,
     templateUrl: `./motion-poll-detail-content.component.html`,
+    imports: [TranslatePipe, SingleOptionChartTableComponent],
     styleUrls: [`./motion-poll-detail-content.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MotionPollDetailContentComponent extends BaseUiComponent implements OnDestroy, OnInit {
-    private _poll!: PollData | null;
+    private _poll!: ViewPoll | null;
 
     public get chartData(): ChartData {
         return this._chartData!;
@@ -33,7 +34,7 @@ export class MotionPollDetailContentComponent extends BaseUiComponent implements
     }
 
     @Input()
-    public set poll(pollData: PollData | null) {
+    public set poll(pollData: ViewPoll | null) {
         this._poll = pollData;
         if (this._poll) {
             this.setupTableData();
@@ -41,7 +42,7 @@ export class MotionPollDetailContentComponent extends BaseUiComponent implements
         }
     }
 
-    public get poll(): PollData | null {
+    public get poll(): ViewPoll | null {
         return this._poll;
     }
 
@@ -74,7 +75,7 @@ export class MotionPollDetailContentComponent extends BaseUiComponent implements
     }
 
     public get isPublished(): boolean {
-        return this.state === PollState.Published;
+        return this.isFinished && this.poll?.published;
     }
 
     public get canSeeResults(): boolean {
@@ -113,6 +114,7 @@ export class MotionPollDetailContentComponent extends BaseUiComponent implements
     }
 
     private setupTableData(): void {
+        /* TODO: update
         this.updateSubscription(
             CHART_DATA_SUBSCRIPTION_NAME,
             this.pollService
@@ -127,6 +129,7 @@ export class MotionPollDetailContentComponent extends BaseUiComponent implements
                     this.cd.markForCheck();
                 })
         );
+        */
     }
 
     private setChartData(): void {
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
index bc1e58a355..df78c0f7ed 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.html
@@ -1,63 +1,9 @@
 <mat-dialog-content>
-    <os-motion-poll-form
-        #pollForm
-        [data]="pollData"
-        [percentBases]="PercentBaseVerbose"
-        [pollClassType]="pollClassType.Motion"
-        [pollMethods]="MotionPollMethodsVerbose"
-        [pollService]="motionPollService"
-    />
-    @if (pollForm.contentForm.get('type')!.value === 'analog') {
-        <div class="os-form-card-mobile">
-            <form [formGroup]="dialogVoteForm">
-                <div formGroupName="options">
-                    @for (option of options; track option) {
-                        <div>
-                            @for (field of analogVoteFields; track field) {
-                                <div [formGroupName]="option.fqid">
-                                    <os-check-input
-                                        inputType="number"
-                                        [checkboxLabel]="'majority' | translate"
-                                        [checkboxValue]="-1"
-                                        [formControlName]="field"
-                                        [placeholder]="voteValueVerbose[field] | translate"
-                                        [radioGroupValue]="majority"
-                                    ></os-check-input>
-                                </div>
-                            }
-                        </div>
-                    }
-                </div>
-                <os-check-input
-                    formControlName="votesvalid"
-                    inputType="number"
-                    [placeholder]="'Valid votes' | translate"
-                ></os-check-input>
-                <os-check-input
-                    formControlName="votesinvalid"
-                    inputType="number"
-                    [placeholder]="'Invalid votes' | translate"
-                ></os-check-input>
-                <os-check-input
-                    formControlName="votescast"
-                    inputType="number"
-                    [placeholder]="'Total votes cast' | translate"
-                ></os-check-input>
-            </form>
-        </div>
-        <!-- Publish immediately button. Only show for new polls -->
-        @if (!pollData.isPublished) {
-            <div>
-                <mat-checkbox [(ngModel)]="publishImmediately" (change)="publishStateChanged($event.checked)">
-                    <span>{{ 'Publish immediately' | translate }}</span>
-                </mat-checkbox>
-                @if (!dialogVoteForm.valid) {
-                    <mat-error>{{ 'Error in form field.' | translate }}</mat-error>
-                }
-            </div>
-        }
-    }
+    <os-poll-form [data]="pollData" [isEVotingEnabled]="isEVotingEnabled">
+        <os-poll-form-approval [data]="pollData" />
+    </os-poll-form>
 </mat-dialog-content>
+
 <mat-dialog-actions>
     <button mat-button [disabled]="!formsValid" (click)="submitPoll()">
         <span>{{ 'Save' | translate }}</span>
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
index 86488f55f6..fe725139ea 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts
@@ -1,66 +1,47 @@
-import { AfterViewInit, Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { _ } from '@ngx-translate/core';
-import { BaseModel } from 'src/app/domain/models/base/base-model';
-import { PollPercentBaseVerbose, VoteValue } from 'src/app/domain/models/poll';
+import { Component, inject, viewChild } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { TranslatePipe } from '@ngx-translate/core';
+import { PollVisibility } from 'src/app/domain/models/poll';
+import { PollUpdatePayload } from 'src/app/gateways/vote-api.service';
 import { BasePollDialogComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component';
-import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions';
-import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
-
-import { MotionPollService } from '../../services';
-
-export const MotionPollMethodsVerbose = {
-    YN: _(`Yes/No`),
-    YNA: _(`Yes/No/Abstain`)
-};
+import { PollFormComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form/poll-form.component';
+import { PollFormApprovalComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll-form-approval/poll-form-approval.component';
+import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service';
 
 @Component({
     selector: `os-motion-poll-dialog`,
     templateUrl: `./motion-poll-dialog.component.html`,
-    styleUrls: [`./motion-poll-dialog.component.scss`],
-    standalone: false
+    imports: [PollFormComponent, PollFormApprovalComponent, MatDialogModule, MatButtonModule, TranslatePipe],
+    styleUrls: [`./motion-poll-dialog.component.scss`]
 })
-export class MotionPollDialogComponent extends BasePollDialogComponent implements AfterViewInit {
-    public PercentBaseVerbose = PollPercentBaseVerbose;
-    public majority: string;
-
-    public MotionPollMethodsVerbose = MotionPollMethodsVerbose;
+export class MotionPollDialogComponent extends BasePollDialogComponent {
+    private approvalForm = viewChild.required(PollFormApprovalComponent);
 
-    public constructor(
-        public motionPollService: MotionPollService,
-        @Inject(MAT_DIALOG_DATA) pollData: ViewPoll<ViewMotion>
-    ) {
-        super(pollData);
+    public get isEVotingEnabled(): boolean {
+        return this.pollService.isElectronicVotingEnabled;
     }
 
-    public ngAfterViewInit(): void {
-        this.dialogVoteForm.get(`options.${this.pollData.content_object?.fqid}`)?.valueChanges.subscribe(data => {
-            let newMajority = data[this.majority] === -1 ? this.majority : ``;
-            for (const option of Object.keys(data)) {
-                if (data[option] === -1 && this.majority !== option) {
-                    newMajority = option;
-                }
-            }
+    private pollService = inject(PollService);
 
-            if (this.majority !== newMajority) {
-                for (const option of Object.keys(data)) {
-                    if (data[option] === -1 && newMajority !== option) {
-                        this.dialogVoteForm
-                            .get(`options.${this.pollData.content_object?.fqid}.${option}`)
-                            ?.setValue(``);
-                    }
-                }
-            }
+    public override submitPoll(): void {
+        const formValues = this.pollForm().getValues();
+        const config = { ...this.approvalForm().approvalForm.value };
+        const visibility: PollVisibility = formValues?.visibility;
 
-            this.majority = newMajority;
-        });
-    }
+        const payload: PollUpdatePayload = {
+            title: formValues?.title,
+            method: `approval`,
+            method_config: config,
+            visibility,
+            allow_vote_split: false
+        };
 
-    protected getAnalogVoteFields(): VoteValue[] {
-        return [`Y`, `N`, `A`];
-    }
+        if (visibility !== PollVisibility.Manually) {
+            payload.entitled_group_ids = formValues?.entitled_group_ids ?? [];
+            payload.live_voting_enabled = formValues?.live_voting_enabled ?? false;
+        }
 
-    protected getContentObjectsForOptions(): BaseModel[] {
-        return [this.pollData.content_object];
+        this.dialogRef.close(payload);
     }
 }
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.html
new file mode 100644
index 0000000000..31ee882616
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.html
@@ -0,0 +1 @@
+<p></p>
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts
index e2bbf7f357..e9101e703d 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts
@@ -1,28 +1,12 @@
-import { Component, ViewEncapsulation } from '@angular/core';
-import { _ } from '@ngx-translate/core';
-import { PollPropertyVerboseKey } from 'src/app/domain/models/poll';
-import {
-    BasePollFormComponent,
-    PollFormHideSelectsData
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component';
+import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
 
 @Component({
     selector: `os-motion-poll-form`,
-    templateUrl: `../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.html`,
-    styleUrls: [`../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.scss`],
-    providers: [{ provide: BasePollFormComponent, useExisting: MotionPollFormComponent }],
-    encapsulation: ViewEncapsulation.None,
-    standalone: false
+    templateUrl: `./motion-poll-form.component.html`,
+    encapsulation: ViewEncapsulation.None
 })
-export class MotionPollFormComponent extends BasePollFormComponent {
-    public override PollPropertyVerbose: Record<PollPropertyVerboseKey, string> = {
-        ...this.PollPropertyVerbose,
-        pollmethod: _(`Voting method`)
-    };
-
-    public get hideSelects(): PollFormHideSelectsData {
-        return {
-            globalOptions: true
-        };
-    }
+export class MotionPollFormComponent extends BaseUiComponent {
+    @Input()
+    public data: any;
 }
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.html
deleted file mode 100644
index e3995c7f63..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.html
+++ /dev/null
@@ -1,19 +0,0 @@
-@if (poll) {
-    <div class="poll-content">
-        @if (poll.entitled_groups && poll.type && poll.type !== 'analog') {
-            <small>
-                {{ 'Groups' | translate }}:
-                <os-comma-separated-listing [list]="poll.entitled_groups">
-                    <ng-template let-group>{{ group.getTitle() }}</ng-template>
-                </os-comma-separated-listing>
-            </small>
-        }
-        <small>{{ '100% base' | translate }}: {{ poll.percentBaseVerbose | translate }}</small>
-        <!-- Poll backend duration type -->
-        @if (poll.backend) {
-            <small>
-                {{ 'Voting duration' | translate }}: {{ POLL_BACKEND_DURATION_LABEL[poll.backend] | translate }}
-            </small>
-        }
-    </div>
-}
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.scss b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.scss
deleted file mode 100644
index 22d5dccac4..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.poll-content {
-    text-align: right;
-    display: grid;
-    padding-top: 20px;
-}
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.spec.ts
deleted file mode 100644
index c7e7fb87c5..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MotionPollMetaInformationComponent } from './motion-poll-meta-information.component';
-
-xdescribe(`MotionPollMetaInformationComponent`, () => {
-    let component: MotionPollMetaInformationComponent;
-    let fixture: ComponentFixture<MotionPollMetaInformationComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [MotionPollMetaInformationComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(MotionPollMetaInformationComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts
deleted file mode 100644
index c46626dfe6..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-import { BasePollMetaInformationComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component';
-
-@Component({
-    selector: `os-motion-poll-meta-information`,
-    templateUrl: `./motion-poll-meta-information.component.html`,
-    styleUrls: [`./motion-poll-meta-information.component.scss`],
-    standalone: false
-})
-export class MotionPollMetaInformationComponent extends BasePollMetaInformationComponent {}
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.spec.ts
deleted file mode 100644
index fc58c11545..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MotionPollVoteComponent } from './motion-poll-vote.component';
-
-xdescribe(`MotionPollVoteComponent`, () => {
-    let component: MotionPollVoteComponent;
-    let fixture: ComponentFixture<MotionPollVoteComponent>;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [MotionPollVoteComponent]
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(MotionPollVoteComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it(`should create`, () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts
deleted file mode 100644
index 76397fd9b1..0000000000
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { Id } from 'src/app/domain/definitions/key-types';
-import { VoteValue } from 'src/app/domain/models/poll/vote-constants';
-import {
-    BasePollVoteComponent,
-    VoteOption
-} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
-import { PromptService } from 'src/app/ui/modules/prompt-dialog';
-
-import { ViewOption } from '../../../../../polls';
-
-@Component({
-    selector: `os-motion-poll-vote`,
-    templateUrl: `../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.html`,
-    styleUrls: [`../../../../../../modules/poll/components/base-poll-vote/base-poll-vote.component.scss`],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: false
-})
-export class MotionPollVoteComponent extends BasePollVoteComponent {
-    public override readonly settings = {
-        hideLeftoverVotes: true,
-        hideGlobalOptions: true,
-        hideSendNow: true,
-        isSplitSingleOption: true
-    };
-
-    public constructor(
-        private promptService: PromptService,
-        meetingSettingsService: MeetingSettingsService
-    ) {
-        super(meetingSettingsService);
-    }
-
-    public getActionButtonClass(voteOption: VoteOption, option: ViewOption, user: ViewUser = this.user): string {
-        if (this.voteRequestData[user?.id]?.value === voteOption.vote) {
-            return voteOption.css!;
-        }
-        return ``;
-    }
-
-    public async saveSingleVote(optionId: Id, vote: VoteValue, user: ViewUser = this.user): Promise<void> {
-        if (!this.voteRequestData[user?.id]) {
-            return;
-        }
-        this.voteRequestData[user.id].value = vote;
-
-        const title = this.translate.instant(`Submit selection now?`);
-        const content = this.translate.instant(`Your decision cannot be changed afterwards.`);
-        const confirmed = await this.promptService.open(title, content);
-
-        if (confirmed) {
-            await super.submitVote(user, { [optionId]: vote });
-        }
-    }
-
-    public override shouldStrikeOptionText(_option: ViewOption, _user: ViewUser): boolean {
-        return false;
-    }
-}
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html
index 0d3d8f70a2..495609def3 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.html
@@ -1,93 +1,8 @@
 @if (showPoll) {
     <mat-card class="motion-poll-wrapper">
         <mat-card-content>
-            <!-- Poll Infos -->
-            <div class="poll-title-wrapper">
-                <!-- Title Area -->
-                <div class="poll-title-area">
-                    <!-- Title -->
-                    <span class="poll-title break-word">
-                        @if (isSameMeeting) {
-                            <a [routerLink]="getDetailLink()">
-                                {{ poll.title | translate }}
-                            </a>
-                        } @else {
-                            {{ poll.title | translate }}
-                        }
-                    </span>
-                </div>
-                <!-- Dot Menu -->
-                <span *osPerms="permission.motionCanManagePolls; and: isSameMeeting" class="poll-actions">
-                    <button mat-icon-button [matMenuTriggerFor]="pollDetailMenu">
-                        <mat-icon class="icon-18">more_horiz</mat-icon>
-                    </button>
-                </span>
-            </div>
-            <!-- Subtitle -->
-            <div class="italic spacer-bottom-20">
-                <!-- Type and State -->
-                <div class="type-and-state italic spacer-bottom-20 break-word">
-                    <span *osPerms="permission.motionCanManagePolls; and: poll.isEVoting">
-                        <os-icon-container
-                            class="poll-type break-word"
-                            color="primary"
-                            icon="info"
-                            [showIcon]="poll.isAnonymous"
-                            [swap]="true"
-                            (iconAction)="openVotingWarning()"
-                        >
-                            {{ poll.typeVerbose | translate }}
-                        </os-icon-container>
-                        @if (poll.isAnonymous) {
-                            <span>&nbsp;</span>
-                        }
-                        &middot;&nbsp;
-                    </span>
-                    <!-- State -->
-                    <span class="break-word">
-                        @if (isAnonymous && poll.canBeVotedFor()) {
-                            {{ 'Voting in progress' | translate }}
-                        } @else {
-                            {{ poll.stateVerbose | translate }}
-                        }
-                    </span>
-                </div>
-            </div>
-            <!-- Change state button -->
-            <span *osPerms="permission.motionCanManagePolls; and: !hideChangeState">
-                @if (pollStateActions[poll.state]) {
-                    <button
-                        mat-stroked-button
-                        [disabled]="stateChangePendingObservable | async"
-                        [ngClass]="pollStateActions[poll.state].css"
-                        (click)="nextPollState()"
-                    >
-                        <mat-icon>{{ pollStateActions[poll.state].icon }}</mat-icon>
-                        <span class="next-state-label">
-                            @if ((stateChangePendingObservable | async) === false) {
-                                {{ poll.nextStateActionVerbose | translate }}
-                            }
-                            @if (stateChangePendingObservable | async) {
-                                {{ 'In progress, please wait ...' | translate }}
-                            }
-                        </span>
-                    </button>
-                }
-            </span>
-            <!-- Results -->
-            @if (poll && !poll.stateHasVotes && poll.type !== 'analog') {
-                @if (poll && poll.isStarted) {
-                    <os-poll-progress [canManagePoll]="canManagePoll" [poll]="poll" />
-                }
-                @if (poll.canBeVotedFor()) {
-                    <os-motion-poll-vote [displayInAutopilot]="false" [poll]="poll" />
-                }
-                <os-motion-poll-meta-information [poll]="poll" />
-            } @else {
-                <span [ngClass]="{ 'poll-link-wrapper': isSameMeeting }">
-                    <ng-container [ngTemplateOutlet]="canSeeVotes ? viewTemplate : emptyTemplate"></ng-container>
-                </span>
-            }
+            <os-poll [poll]="poll"></os-poll>
+
             <!-- Detail link -->
             @if (poll.isPublished && isSameMeeting) {
                 <div class="poll-detail-button-wrapper">
@@ -99,73 +14,3 @@
         </mat-card-content>
     </mat-card>
 }
-
-<ng-template #viewTemplate>
-    @if (isSameMeeting) {
-        <os-motion-poll-detail-content [poll]="poll" [routerLink]="getDetailLink()" />
-    } @else {
-        <os-motion-poll-detail-content [poll]="poll" />
-    }
-</ng-template>
-
-<ng-template #emptyTemplate>
-    <span *osPerms="permission.motionCanManagePolls; and: poll.type === 'analog'">
-        <button mat-stroked-button matTooltip="{{ 'Edit' | translate }}" (click)="dialogOpened.emit()">
-            <mat-icon>edit</mat-icon>
-        </button>
-        <div>
-            {{ 'Edit to enter votes.' | translate }}
-        </div>
-    </span>
-    @if (poll.type !== 'analog') {
-        <p>
-            <i *osPerms="permission.motionCanManagePolls; or: isPublished">
-                {{ 'No one has voted for this poll' | translate }}
-            </i>
-        </p>
-    }
-</ng-template>
-
-<!-- More Menu -->
-<mat-menu #pollDetailMenu="matMenu">
-    <button *osPerms="permission.motionCanManagePolls" mat-menu-item (click)="dialogOpened.emit()">
-        <mat-icon>edit</mat-icon>
-        <span>{{ 'Edit' | translate }}</span>
-    </button>
-    <os-projector-button
-        *osPerms="permission.projectorCanManage"
-        [allowReferenceProjector]="true"
-        [menuItem]="true"
-        [object]="poll.getProjectionBuildDescriptor()"
-    />
-    <button
-        *osPerms="
-            permission.motionCanManagePolls;
-            and: poll && poll.type === 'named' && (poll.isFinished || poll.isPublished) && !poll.is_pseudoanonymized
-        "
-        mat-menu-item
-        (click)="pseudoanonymizePoll()"
-    >
-        <mat-icon>warning</mat-icon>
-        <span>{{ 'Anonymize votes' | translate }}</span>
-    </button>
-    <button mat-menu-item (click)="downloadPdf()">
-        <mat-icon>picture_as_pdf</mat-icon>
-        <span>{{ 'Ballot papers' | translate }}</span>
-    </button>
-    <div *osPerms="permission.motionCanManagePolls">
-        <mat-divider></mat-divider>
-
-        <!-- Reset Button -->
-        <button mat-menu-item (click)="resetState()">
-            <mat-icon color="warn">replay</mat-icon>
-            <span>{{ 'Reset state' | translate }}</span>
-        </button>
-
-        <!-- Delete button -->
-        <button mat-menu-item (click)="deletePoll()">
-            <mat-icon color="warn">delete</mat-icon>
-            <span>{{ 'Delete' | translate }}</span>
-        </button>
-    </div>
-</mat-menu>
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts
index e41b88413e..a27f05b7c3 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts
@@ -1,23 +1,42 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatIconModule } from '@angular/material/icon';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { RouterModule } from '@angular/router';
+import { TranslatePipe } from '@ngx-translate/core';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Permission } from 'src/app/domain/definitions/permission';
-import { PollState, VOTE_MAJORITY } from 'src/app/domain/models/poll';
+import { ProjectorButtonModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module';
 import { BasePollComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll.component';
+import { PollComponent } from 'src/app/site/pages/meetings/modules/poll/components/poll/poll.component';
 import { OperatorService } from 'src/app/site/services/operator.service';
+import { DirectivesModule } from 'src/app/ui/directives';
 
-import { VotingPrivacyWarningDialogService } from '../../../../../../modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service';
 import { ViewPoll } from '../../../../../polls';
-import { MotionPollService } from '../../services';
-import { MotionPollPdfService } from '../../services/motion-poll-pdf.service/motion-poll-pdf.service';
 
 @Component({
     selector: `os-motion-poll`,
+    imports: [
+        PollComponent,
+        RouterModule,
+        TranslatePipe,
+        DirectivesModule,
+        MatButtonModule,
+        MatCardModule,
+        MatTooltipModule,
+        MatIconModule,
+        MatMenuModule,
+        MatDividerModule,
+        ProjectorButtonModule
+    ],
     templateUrl: `./motion-poll.component.html`,
-    styleUrls: [`./motion-poll.component.scss`],
-    standalone: false
+    styleUrls: [`./motion-poll.component.scss`]
 })
 export class MotionPollComponent extends BasePollComponent {
+    // TODO: use signals
     @Input()
     public set pollViewModel(poll: ViewPoll) {
         this.poll = poll;
@@ -44,52 +63,13 @@ export class MotionPollComponent extends BasePollComponent {
         return false;
     }
 
-    public get isAnonymous(): boolean {
-        return this.operator.isAnonymousLoggedIn;
-    }
-
-    public get canSeeVotes(): boolean {
-        const option = this.poll.options[0];
-        return (
-            (this.poll.hasVotes && this.poll.stateHasVotes) ||
-            [option?.yes, option?.no, option?.abstain].some(value => value === VOTE_MAJORITY)
-        );
-    }
-
-    public get isEVotingEnabled(): boolean {
-        return this.pollService.isElectronicVotingEnabled;
-    }
-
-    public get isPublished(): boolean {
-        return this.poll.state === PollState.Published;
-    }
-
     public get isSameMeeting(): boolean {
         return !this.poll.meeting_id || this.activeMeetingId === this.poll.meeting_id;
     }
 
-    public get canManagePoll(): boolean {
-        return this.operator.hasPerms(Permission.motionCanManagePolls);
-    }
-
-    public constructor(
-        protected override translate: TranslateService,
-        private pollService: MotionPollService,
-        private pdfService: MotionPollPdfService,
-        private operator: OperatorService,
-        private votingPrivacyDialog: VotingPrivacyWarningDialogService
-    ) {
-        super();
-    }
-
-    public openVotingWarning(): void {
-        this.votingPrivacyDialog.open();
-    }
-
-    public downloadPdf(): void {
-        this.pdfService.printBallots(this.poll);
-    }
+    private operator = inject(OperatorService);
 
+    // TODO: Check if can removed
     public getDetailLink(): string {
         return `/${this.activeMeetingId}/motions/polls/${this.poll.sequential_number}`;
     }
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts
index 0837821385..b14b69477c 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts
@@ -30,22 +30,18 @@ import { MotionPollComponent } from './components/motion-poll/motion-poll.compon
 import { MotionPollDetailContentComponent } from './components/motion-poll-detail-content/motion-poll-detail-content.component';
 import { MotionPollDialogComponent } from './components/motion-poll-dialog/motion-poll-dialog.component';
 import { MotionPollFormComponent } from './components/motion-poll-form/motion-poll-form.component';
-import { MotionPollMetaInformationComponent } from './components/motion-poll-meta-information/motion-poll-meta-information.component';
-import { MotionPollVoteComponent } from './components/motion-poll-vote/motion-poll-vote.component';
 import { MotionPollService } from './services';
 import { MotionPollServiceModule } from './services/motion-poll-service.module';
 
-const DECLARATIONS = [
-    MotionPollComponent,
-    MotionPollMetaInformationComponent,
-    MotionPollDetailContentComponent,
-    MotionPollVoteComponent // TODO: Only exported to have access to it in the autopilot
-];
 const MODULES = [MotionPollServiceModule];
 
 @NgModule({
     imports: [
         ...MODULES,
+        MotionPollComponent,
+        MotionPollDetailContentComponent,
+        MotionPollFormComponent,
+        MotionPollDialogComponent,
         CustomIconComponent,
         CommonModule,
         CommaSeparatedListingComponent,
@@ -73,8 +69,7 @@ const MODULES = [MotionPollServiceModule];
         OpenSlidesTranslationModule.forChild(),
         IconContainerComponent
     ],
-    exports: [...MODULES, ...DECLARATIONS, PollModule],
-    declarations: [MotionPollDialogComponent, MotionPollFormComponent, ...DECLARATIONS],
+    exports: [...MODULES, PollModule, MotionPollComponent, MotionPollDetailContentComponent],
     providers: [{ provide: PollService, useClass: MotionPollService }]
 })
 export class MotionPollModule {
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts
index 24318c6090..643c7560dc 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Fqid } from 'src/app/domain/definitions/key-types';
-import { PollClassType } from 'src/app/domain/models/poll/poll-constants';
 import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
 import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls';
 
@@ -11,7 +10,7 @@ export class MotionPollControllerService {
     public constructor(private repo: PollRepositoryService) {}
 
     public getViewModelList(): ViewPoll[] {
-        return this.repo.getViewModelList().filter(poll => poll.pollClassType === PollClassType.Motion);
+        return this.repo.getViewModelList().filter(poll => poll.isMotionPoll);
     }
 
     public getViewModelListByContentObject(fqid: Fqid): ViewPoll[] {
diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
index cad9479845..916db46a86 100644
--- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
@@ -1,34 +1,13 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { map, merge, Observable, of } from 'rxjs';
 import { Motion } from 'src/app/domain/models/motions/motion';
-import { OptionData, OptionDataKey, PollData, PollDataKey } from 'src/app/domain/models/poll/generic-poll';
 import { Poll } from 'src/app/domain/models/poll/poll';
-import {
-    ABSTAIN_KEY,
-    CalculablePollKey,
-    INVALID_VOTES_KEY,
-    NO_KEY,
-    PollMethod,
-    PollPercentBase,
-    PollTableData,
-    PollType,
-    VOTE_MAJORITY,
-    VotingResult,
-    YES_KEY
-} from 'src/app/domain/models/poll/poll-constants';
+import { BaseOnehundredPercentBase } from 'src/app/domain/models/poll/poll-config-types';
+import { PollVisibility } from 'src/app/domain/models/poll/poll-constants';
 import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service';
-import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 
 import { MotionPollControllerService } from '../motion-poll-controller.service';
 
-export interface TableDataEntryCreationInput {
-    poll: PollData;
-    result: VotingResult;
-    option?: OptionData;
-    showPercent?: boolean;
-}
-
 /**
  * Service class for motion polls.
  */
@@ -36,33 +15,30 @@ export interface TableDataEntryCreationInput {
     providedIn: `root`
 })
 export class MotionPollService extends PollService {
-    public defaultPercentBase!: PollPercentBase;
-    public defaultPollMethod: PollMethod | undefined;
-    public defaultPollType!: PollType;
+    public defaultPercentBase!: BaseOnehundredPercentBase;
+    public defaultPollVisibility!: PollVisibility;
     public defaultGroupIds!: number[];
 
     public constructor(
         protected override translate: TranslateService,
-        private repo: MotionPollControllerService,
-        private meetingSettingsService: MeetingSettingsService
+        private repo: MotionPollControllerService
     ) {
         super();
         this.meetingSettingsService
             .get(`motion_poll_default_onehundred_percent_base`)
             .subscribe(base => (this.defaultPercentBase = base));
-        this.meetingSettingsService.get(`motion_poll_default_type`).subscribe(type => (this.defaultPollType = type));
-        this.meetingSettingsService.get(`motion_poll_default_group_ids`).subscribe(ids => (this.defaultGroupIds = ids));
         this.meetingSettingsService
-            .get(`motion_poll_default_method`)
-            .subscribe(method => (this.defaultPollMethod = method));
+            .get(`motion_poll_default_type`)
+            .subscribe(type => (this.defaultPollVisibility = type as any));
+        this.meetingSettingsService.get(`motion_poll_default_group_ids`).subscribe(ids => (this.defaultGroupIds = ids));
     }
 
     public getDefaultPollData(contentObject?: Motion): Partial<Poll> {
         const poll: Partial<Poll> = {
-            onehundred_percent_base: this.defaultPercentBase,
+            // onehundred_percent_base: this.defaultPercentBase,
+            // pollmethod: this.defaultPollMethod
             entitled_group_ids: Object.values(this.defaultGroupIds ?? []),
-            type: this.isElectronicVotingEnabled ? this.defaultPollType : PollType.Analog,
-            pollmethod: this.defaultPollMethod
+            visibility: this.isElectronicVotingEnabled ? this.defaultPollVisibility : PollVisibility.Manually
         };
 
         let titlePrefix = this.translate.instant(`Motion`);
@@ -83,83 +59,4 @@ export class MotionPollService extends PollService {
 
         return poll;
     }
-
-    public generateTableDataAsObservable(poll: PollData): Observable<PollTableData[]> {
-        // The "of(...)"-observable is used to fire the current state the first time.
-        return merge(of(poll?.options), poll.options$).pipe(map(options => this.createTableData(poll, options)));
-    }
-
-    public override generateTableData(poll: PollData): PollTableData[] {
-        return this.createTableData(poll, poll.options);
-    }
-
-    public shouldShowChart(poll: PollData | null): boolean {
-        return (
-            !!poll &&
-            poll.options &&
-            poll.options.some(option => option.yes! >= 0 || option.no! >= 0 || option.abstain! >= 0)
-        );
-    }
-
-    protected override getPollDataFields(poll: PollData): CalculablePollKey[] {
-        switch (poll?.onehundred_percent_base) {
-            case PollPercentBase.YN:
-                return [YES_KEY, NO_KEY];
-            case PollPercentBase.Cast:
-                return [YES_KEY, NO_KEY, ABSTAIN_KEY, INVALID_VOTES_KEY];
-            default:
-                return [YES_KEY, NO_KEY, ABSTAIN_KEY];
-        }
-    }
-
-    private createTableData(poll: PollData, options: OptionData[]): PollTableData[] {
-        const showPercent = !super
-            .getVoteTableKeys(poll)
-            .some(key => options.some(option => option[key.vote as OptionDataKey] === VOTE_MAJORITY));
-        let tableData: PollTableData[] = options.flatMap(option =>
-            super
-                .getVoteTableKeys(poll)
-                .map(key =>
-                    this.createTableDataEntry({ poll: poll, result: key, option: option, showPercent: showPercent })
-                )
-        );
-        tableData.push(
-            ...super.getSumTableKeys(poll).map(key => this.createTableDataEntry({ poll: poll, result: key }))
-        );
-
-        tableData = tableData.filter(localeTableData => !localeTableData.value.some(result => result.hide));
-        return tableData;
-    }
-
-    private createTableDataEntry(data: TableDataEntryCreationInput): PollTableData {
-        return {
-            votingOption: data.result.vote || ``,
-            value: [
-                {
-                    amount: (data.option
-                        ? data.option[data.result.vote as OptionDataKey]
-                        : data.poll[data.result.vote as PollDataKey]) as number,
-                    hide: data.result.hide,
-                    icon: data.result.icon,
-                    showPercent: this.calculateShowPercent(
-                        data.poll,
-                        data.option ? (data.result.vote as OptionDataKey) : (data.result.vote as PollDataKey),
-                        data.showPercent ?? data.result.showPercent
-                    )
-                }
-            ]
-        };
-    }
-
-    private calculateShowPercent(
-        poll: PollData,
-        votingOption: OptionDataKey | PollDataKey,
-        pollShowPercent: boolean
-    ): boolean {
-        const option = [`yes`, `no`, `abstain`].includes(votingOption) ? votingOption.charAt(0).toUpperCase() : null;
-        if (!option || !poll.onehundred_percent_base) {
-            return pollShowPercent;
-        }
-        return poll.onehundred_percent_base.indexOf(option) !== -1 ? pollShowPercent : false;
-    }
 }
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts
index 472ddf502e..1e259f6cf5 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts
@@ -34,7 +34,8 @@ export class MotionAddPollButtonComponent {
         const dialogData: Partial<PollDialogData> = {
             content_object_id: this.motion.fqid,
             content_object: this.motion,
-            ...defaultPollData
+            ...defaultPollData,
+            live_voting_enabled: this.motionPollService.defaultPollLiveVotingEnabled
         };
 
         this.pollDialog.open(dialogData);
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.html
index d27c48e468..176f904a16 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.html
@@ -28,17 +28,17 @@ <h1 class="mock-h2">
         <h1>{{ poll.title | translate }}</h1>
         <div>
             <!-- Voting type -->
-            @if (poll.type !== 'analog') {
-                <span>{{ poll.typeVerbose | translate }} &middot;</span>
+            @if (poll.isAnalog) {
+                <span>{{ poll.visibility | translateKey: 'poll_visibility' }} &middot;</span>
             }
             <!-- State -->
             <span>
-                {{ poll.stateVerbose | translate }}
+                {{ poll.state | translateKey: 'poll_state' }}
             </span>
         </div>
         <os-motion-poll-detail-content [poll]="poll" />
         @if (poll.isStarted) {
-            <os-poll-progress [canManagePoll]="canManagePoll" [poll]="poll" />
+            <os-poll-progress [poll]="poll" />
             <div *osPerms="permission.motionCanManagePolls" class="poll-content">
                 <div class="user-subtitle">
                     {{ 'Present entitled users' | translate }}:
@@ -51,7 +51,7 @@ <h1>{{ poll.title | translate }}</h1>
             </div>
         }
         <!-- Named table: only show if votes are present -->
-        @if (showResults && poll.stateHasVotes && poll.isEVoting && poll.type === 'named') {
+        @if (showResults && poll.stateHasVotes && poll.isEVoting && poll.isNamed) {
             <os-poll-filted-votes-chart [poll]="poll" />
         }
 
@@ -93,7 +93,8 @@ <h1>{{ poll.title | translate }}</h1>
             </mat-tab-group>
         }
     }
-    <os-motion-poll-meta-information [poll]="poll" />
+
+    <!-- TODO: Readd poll meta info -->
 </ng-template>
 
 <!-- More Menu -->
@@ -104,10 +105,7 @@ <h1>{{ poll.title | translate }}</h1>
         <span>{{ 'Edit' | translate }}</span>
     </button>
     <button
-        *osPerms="
-            permission.motionCanManagePolls;
-            and: poll && poll.type === 'named' && (poll.isFinished || poll.isPublished) && !poll.is_pseudoanonymized
-        "
+        *osPerms="permission.motionCanManagePolls; and: poll.canAnonymize"
         mat-menu-item
         (click)="pseudoanonymizePoll()"
     >
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts
index 91bccc45b4..a02517c78a 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts
@@ -17,7 +17,9 @@ export interface ExtendedVoteData extends BaseVoteData {
 
 @Component({
     selector: `os-motion-poll-detail`,
-    templateUrl: `./motion-poll-detail.component.html`,
+    template: `
+        TODO
+    `,
     styleUrls: [`./motion-poll-detail.component.scss`],
     changeDetection: ChangeDetectionStrategy.OnPush,
     encapsulation: ViewEncapsulation.None,
@@ -50,15 +52,18 @@ export class MotionPollDetailComponent extends BasePollDetailComponent<ViewMotio
     }
 
     protected createVotesData(): ExtendedVoteData[] {
+        /*
         const voteData = this.poll?.options[0]?.votes;
         const extendedVoteData: ExtendedVoteData[] = this.poll?.options[0]?.votes;
         if (extendedVoteData) {
             extendedVoteData.map(
                 (element, index) =>
-                    (element.vote_verbose_translated = this.translate.instant(voteData[index].vote.valueVerbose))
+                    (element.vote_verbose_translated = this.translate.instant(voteData[index].ballot.valueVerbose))
             );
         }
         return extendedVoteData;
+        */
+        return [];
     }
 
     public openDialog(): void {
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts
index a3192bf56c..9320d175d1 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts
@@ -11,6 +11,7 @@ import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/mo
 import { DirectivesModule } from 'src/app/ui/directives';
 import { HeadBarModule } from 'src/app/ui/modules/head-bar';
 import { ListModule } from 'src/app/ui/modules/list';
+import { TranslateKeyPipe } from 'src/app/ui/pipes/translate-key/translate-key.pipe';
 
 import { ParticipantCommonServiceModule } from '../../../participants/services/common/participant-common-service.module';
 import { MotionPollModule } from '../../modules/motion-poll';
@@ -32,6 +33,7 @@ import { MotionPollsRoutingModule } from './motion-polls-routing.module';
         MotionPollModule,
         ParticipantCommonServiceModule,
         DirectivesModule,
+        TranslateKeyPipe,
         HeadBarModule,
         ListModule,
         MeetingsComponentCollectorModule,
diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.html b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.html
index 6996f2a30f..f63da1241b 100644
--- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.html
+++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.html
@@ -35,7 +35,7 @@ <h1 class="mock-h2" translate>List of electronic votes</h1>
         @if (!isMultiSelect) {
             <os-detail-view-navigator [model]="poll"></os-detail-view-navigator>
         }
-        <span>{{ poll.stateVerbose | translate }}</span>
+        <span>{{ poll.state | translateKey: 'poll_state' }}</span>
     </div>
 
     <!-- Voted Indicator -->
diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts
index 5733e9f15a..56bd7fd774 100644
--- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts
@@ -34,7 +34,7 @@ export class PollListComponent extends BaseMeetingListViewComponent<ViewPoll> {
      * TODO: Can be removed, when OpenSlides/openslides-autoupdate-service#262 is resolved.
      */
     public canBeVoteFor(poll: ViewPoll): boolean {
-        if (poll.state === PollState.Finished || poll.state === PollState.Published) {
+        if (poll.state === PollState.Finished) {
             return false;
         }
         return poll.canBeVotedFor() && !poll.hasVoted;
diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts
index b31979404a..3bd0262585 100644
--- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts
@@ -5,6 +5,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations';
 import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector';
 import { HeadBarModule } from 'src/app/ui/modules/head-bar';
+import { TranslateKeyPipe } from 'src/app/ui/pipes/translate-key/translate-key.pipe';
 
 import { PollListComponent } from './components/poll-list/poll-list.component';
 import { PollListRoutingModule } from './poll-list-routing.module';
@@ -18,9 +19,10 @@ import { PollListServiceModule } from './services/poll-list-service.module';
         PollListServiceModule,
         MeetingsComponentCollectorModule,
         HeadBarModule,
-        OpenSlidesTranslationModule.forChild(),
         MatIconModule,
-        MatTooltipModule
+        MatTooltipModule,
+        TranslateKeyPipe,
+        OpenSlidesTranslationModule.forChild()
     ]
 })
 export class PollListModule {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts
index 7baa5be4aa..39304d7bd6 100644
--- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts
@@ -36,14 +36,14 @@ export class PollListFilterService extends BaseFilterListService<ViewPoll> {
      */
     protected getFilterDefinitions(): OsFilter<ViewPoll>[] {
         return [
+            // TODO: Add filter for published
             {
                 property: `state`,
                 label: this.translate.instant(`State`),
                 options: [
                     { condition: PollState.Created, label: this.translate.instant(`created`) },
                     { condition: PollState.Started, label: this.translate.instant(`started`) },
-                    { condition: PollState.Finished, label: this.translate.instant(`finished (unpublished)`) },
-                    { condition: PollState.Published, label: this.translate.instant(`published`) }
+                    { condition: PollState.Finished, label: this.translate.instant(`finished`) }
                 ]
             },
             {
diff --git a/client/src/app/site/pages/meetings/pages/polls/polls.config.ts b/client/src/app/site/pages/meetings/pages/polls/polls.config.ts
index 4f5524260b..1596cb560f 100644
--- a/client/src/app/site/pages/meetings/pages/polls/polls.config.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/polls.config.ts
@@ -1,18 +1,31 @@
-import { Option } from 'src/app/domain/models/poll/option';
+import { Ballot } from 'src/app/domain/models/poll/ballot';
 import { Poll } from 'src/app/domain/models/poll/poll';
-import { Vote } from 'src/app/domain/models/poll/vote';
-import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate';
-import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list';
-import { PollCandidateRepositoryService } from 'src/app/gateways/repositories/poll-candidate-lists/poll-candidate';
-import { PollCandidateListRepositoryService } from 'src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list';
-import { OptionRepositoryService } from 'src/app/gateways/repositories/polls/option-repository.service';
+import { PollConfigApproval } from 'src/app/domain/models/poll/poll-config-approval';
+import { PollConfigRatingApproval } from 'src/app/domain/models/poll/poll-config-rating-approval';
+import { PollConfigRatingScore } from 'src/app/domain/models/poll/poll-config-rating-score';
+import { PollConfigSelection } from 'src/app/domain/models/poll/poll-config-selection';
+import { PollConfigStvScottish } from 'src/app/domain/models/poll/poll-config-stv-scottish';
+import { PollOption } from 'src/app/domain/models/poll/poll-option';
+import { BallotRepositoryService } from 'src/app/gateways/repositories/polls/ballot-repository.service';
+import { PollConfigApprovalRepositoryService } from 'src/app/gateways/repositories/polls/poll-config-approval-repository.service';
+import { PollConfigRatingApprovalRepositoryService } from 'src/app/gateways/repositories/polls/poll-config-rating-approval-repository.service';
+import { PollConfigRatingScoreRepositoryService } from 'src/app/gateways/repositories/polls/poll-config-rating-score-repository.service';
+import { PollConfigSelectionRepositoryService } from 'src/app/gateways/repositories/polls/poll-config-selection-repository.service';
+import { PollConfigStvScottishRepositoryService } from 'src/app/gateways/repositories/polls/poll-config-stv-scottish-repository.service';
+import { PollOptionRepositoryService } from 'src/app/gateways/repositories/polls/poll-option-repository.service';
 import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service';
-import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service';
 
 import { AppConfig } from '../../../../../infrastructure/definitions/app-config';
-import { ViewOption, ViewPoll, ViewVote } from './view-models';
-import { ViewPollCandidate } from './view-models/view-poll-candidate';
-import { ViewPollCandidateList } from './view-models/view-poll-candidate-list';
+import {
+    ViewBallot,
+    ViewPoll,
+    ViewPollConfigApproval,
+    ViewPollConfigRatingApproval,
+    ViewPollConfigRatingScore,
+    ViewPollConfigSelection,
+    ViewPollConfigStvScottish,
+    ViewPollOption
+} from './view-models';
 
 export const PollsAppConfig: AppConfig = {
     name: `poll`,
@@ -23,24 +36,44 @@ export const PollsAppConfig: AppConfig = {
             repository: PollRepositoryService
         },
         {
-            model: Option,
-            viewModel: ViewOption,
-            repository: OptionRepositoryService
+            model: PollConfigApproval,
+            viewModel: ViewPollConfigApproval,
+            repository: PollConfigApprovalRepositoryService
         },
         {
-            model: Vote,
-            viewModel: ViewVote,
-            repository: VoteRepositoryService
+            model: PollConfigSelection,
+            viewModel: ViewPollConfigSelection,
+            repository: PollConfigSelectionRepositoryService
         },
         {
-            model: PollCandidate,
-            viewModel: ViewPollCandidate,
-            repository: PollCandidateRepositoryService
+            model: PollConfigRatingApproval,
+            viewModel: ViewPollConfigRatingApproval,
+            repository: PollConfigRatingApprovalRepositoryService
         },
         {
-            model: PollCandidateList,
-            viewModel: ViewPollCandidateList,
-            repository: PollCandidateListRepositoryService
+            model: PollConfigRatingScore,
+            viewModel: ViewPollConfigRatingScore,
+            repository: PollConfigRatingScoreRepositoryService
+        },
+        {
+            model: PollConfigSelection,
+            viewModel: ViewPollConfigSelection,
+            repository: PollConfigSelectionRepositoryService
+        },
+        {
+            model: PollConfigStvScottish,
+            viewModel: ViewPollConfigStvScottish,
+            repository: PollConfigStvScottishRepositoryService
+        },
+        {
+            model: PollOption,
+            viewModel: ViewPollOption,
+            repository: PollOptionRepositoryService
+        },
+        {
+            model: Ballot,
+            viewModel: ViewBallot,
+            repository: BallotRepositoryService
         }
     ]
 };
diff --git a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts
index a053fd12df..24f5b17059 100644
--- a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts
@@ -1,6 +1,5 @@
 import { Id } from 'src/app/domain/definitions/key-types';
-import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc';
-import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user';
+import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 import { BaseSimplifiedModelRequest } from 'src/app/site/services/model-request-builder';
 
@@ -14,35 +13,14 @@ export const pollModelRequest: BaseSimplifiedModelRequest = {
     fieldset: FULL_FIELDSET,
     follow: [
         {
-            idField: `content_object_id`,
-            fieldset: [`title`, ...MEETING_ROUTING_FIELDS],
-            follow: [
-                {
-                    idField: `candidate_ids`,
-                    fieldset: FULL_FIELDSET,
-                    follow: [{ idField: `meeting_user_id`, ...MeetingUserFieldsets.FullNameSubscription }]
-                }
-            ]
+            idField: `config_id`,
+            fieldset: FULL_FIELDSET
         },
-        { idField: `global_option_id`, fieldset: FULL_FIELDSET },
         {
-            idField: `option_ids`,
-            fieldset: FULL_FIELDSET,
-            follow: [
-                {
-                    idField: `content_object_id`,
-                    fieldset: [...UserFieldsets.FullNameSubscription.fieldset, `option_ids`],
-                    follow: [
-                        {
-                            idField: `poll_candidate_ids`,
-                            fieldset: FULL_FIELDSET,
-                            follow: [{ idField: `user_id`, ...UserFieldsets.FullNameSubscription }]
-                        }
-                    ]
-                },
-                { idField: `vote_ids`, fieldset: FULL_FIELDSET }
-            ]
-        }
+            idField: `ballot_ids`,
+            fieldset: [`represented_meeting_user_id`, `poll_id`]
+        },
+        { idField: `option_ids`, fieldset: FULL_FIELDSET }
     ]
 };
 
@@ -60,42 +38,7 @@ export const getPollDetailSubscriptionConfig: SubscriptionConfigGenerator = (...
         viewModelCtor: ViewPoll,
         ids,
         fieldset: FULL_FIELDSET,
-        follow: [
-            { idField: `content_object_id`, fieldset: [`title`, ...MEETING_ROUTING_FIELDS] },
-            {
-                idField: `option_ids`,
-                fieldset: FULL_FIELDSET,
-                follow: [
-                    {
-                        idField: `content_object_id`,
-                        ...UserFieldsets.FullNameSubscription,
-                        follow: [
-                            {
-                                idField: `poll_candidate_ids`,
-                                fieldset: FULL_FIELDSET,
-                                follow: [{ idField: `user_id`, ...UserFieldsets.FullNameSubscription }]
-                            }
-                        ]
-                    },
-                    { idField: `vote_ids`, fieldset: FULL_FIELDSET }
-                ]
-            },
-            {
-                idField: `global_option_id`,
-                fieldset: FULL_FIELDSET,
-                follow: [{ idField: `vote_ids`, fieldset: [] }]
-            },
-            {
-                idField: `entitled_group_ids`,
-                fieldset: [],
-                follow: [
-                    {
-                        idField: `meeting_user_ids`,
-                        fieldset: [`user_id`]
-                    }
-                ]
-            }
-        ]
+        follow: []
     },
     subscriptionName: `${POLL_DETAIL_SUBSCRIPTION}_${ids.join(`_`)}`
 });
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts
index 377f0c174c..9d5683a492 100644
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts
@@ -3,6 +3,9 @@ import { ViewModelRelations } from 'src/app/site/base/base-view-model';
 
 import { ViewPoll } from './view-poll';
 
+export type HasPoll<C extends PollContentObject = any> = ViewModelRelations<{
+    poll: ViewPoll<C>;
+}>;
 export type VotingTextContext<C extends PollContentObject = any> = ViewModelRelations<{
     poll: ViewPoll<C>;
 }> & {
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/index.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/index.ts
index 5c371b1e14..e1807e9423 100644
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/index.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/index.ts
@@ -1,4 +1,9 @@
 export * from './has-polls';
-export * from './view-option';
+export * from './poll-config-approval';
+export * from './poll-config-rating-approval';
+export * from './poll-config-rating-score';
+export * from './poll-config-selection';
+export * from './poll-config-stv-scottish';
+export * from './poll-option';
+export * from './view-ballot';
 export * from './view-poll';
-export * from './view-vote';
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-approval.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-approval.ts
new file mode 100644
index 0000000000..2d024bc5ca
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-approval.ts
@@ -0,0 +1,18 @@
+import { PollConfigApproval } from 'src/app/domain/models/poll/poll-config-approval';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { HasPoll, ViewPollOption } from '..';
+
+export class ViewPollConfigApproval extends BaseViewModel<PollConfigApproval> {
+    public get poll_config_approval(): PollConfigApproval {
+        return this._model;
+    }
+
+    public static COLLECTION = PollConfigApproval.COLLECTION;
+}
+
+interface IPollConfigApprovalRelations {
+    options: ViewPollOption[];
+}
+export interface ViewPollConfigApproval
+    extends ViewModelRelations<IPollConfigApprovalRelations>, PollConfigApproval, HasPoll {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-approval.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-approval.ts
new file mode 100644
index 0000000000..6fe7a89f3e
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-approval.ts
@@ -0,0 +1,18 @@
+import { PollConfigRatingApproval } from 'src/app/domain/models/poll/poll-config-rating-approval';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { HasPoll, ViewPollOption } from '..';
+
+export class ViewPollConfigRatingApproval extends BaseViewModel<PollConfigRatingApproval> {
+    public get poll_config_rating_approval(): PollConfigRatingApproval {
+        return this._model;
+    }
+
+    public static COLLECTION = PollConfigRatingApproval.COLLECTION;
+}
+
+interface IPollConfigRatingApprovalRelations {
+    options: ViewPollOption[];
+}
+export interface ViewPollConfigRatingApproval
+    extends ViewModelRelations<IPollConfigRatingApprovalRelations>, PollConfigRatingApproval, HasPoll {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-score.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-score.ts
new file mode 100644
index 0000000000..03d0edc009
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-rating-score.ts
@@ -0,0 +1,18 @@
+import { PollConfigRatingScore } from 'src/app/domain/models/poll/poll-config-rating-score';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { HasPoll, ViewPollOption } from '..';
+
+export class ViewPollConfigRatingScore extends BaseViewModel<PollConfigRatingScore> {
+    public get poll_config_rating_score(): PollConfigRatingScore {
+        return this._model;
+    }
+
+    public static COLLECTION = PollConfigRatingScore.COLLECTION;
+}
+
+interface IPollConfigRatingScoreRelations {
+    options: ViewPollOption[];
+}
+export interface ViewPollConfigRatingScore
+    extends ViewModelRelations<IPollConfigRatingScoreRelations>, PollConfigRatingScore, HasPoll {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-selection.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-selection.ts
new file mode 100644
index 0000000000..db2c9162b8
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-selection.ts
@@ -0,0 +1,18 @@
+import { PollConfigSelection } from 'src/app/domain/models/poll/poll-config-selection';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { HasPoll, ViewPollOption } from '..';
+
+export class ViewPollConfigSelection extends BaseViewModel<PollConfigSelection> {
+    public get poll_config_selection(): PollConfigSelection {
+        return this._model;
+    }
+
+    public static COLLECTION = PollConfigSelection.COLLECTION;
+}
+
+interface IPollConfigSelectionRelations {
+    options: ViewPollOption[];
+}
+export interface ViewPollConfigSelection
+    extends ViewModelRelations<IPollConfigSelectionRelations>, PollConfigSelection, HasPoll {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-stv-scottish.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-stv-scottish.ts
new file mode 100644
index 0000000000..4573318a43
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-config-stv-scottish.ts
@@ -0,0 +1,18 @@
+import { PollConfigStvScottish } from 'src/app/domain/models/poll/poll-config-stv-scottish';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { HasPoll, ViewPollOption } from '..';
+
+export class ViewPollConfigStvScottish extends BaseViewModel<PollConfigStvScottish> {
+    public get poll_config_stv_scottish(): PollConfigStvScottish {
+        return this._model;
+    }
+
+    public static COLLECTION = PollConfigStvScottish.COLLECTION;
+}
+
+interface IPollConfigStvScottishRelations {
+    options: ViewPollOption[];
+}
+export interface ViewPollConfigStvScottish
+    extends ViewModelRelations<IPollConfigStvScottishRelations>, PollConfigStvScottish, HasPoll {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/poll-option.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-option.ts
new file mode 100644
index 0000000000..615df5f8de
--- /dev/null
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/poll-option.ts
@@ -0,0 +1,32 @@
+import { OptionTitle } from 'src/app/domain/models/poll';
+import { PollOption } from 'src/app/domain/models/poll/poll-option';
+import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
+
+import { ViewPoll } from '..';
+
+export class ViewPollOption extends BaseViewModel<PollOption> {
+    public get poll_config_option(): PollOption {
+        return this._model;
+    }
+
+    public get isListOption(): boolean {
+        throw new Error(`Not implemented`);
+    }
+
+    public getOptionTitle(): OptionTitle {
+        return {
+            title: this.text
+        };
+    }
+
+    public get contentTitlesAsSortedArray(): OptionTitle[] {
+        throw new Error(`Not implemented`);
+    }
+
+    public static COLLECTION = PollOption.COLLECTION;
+}
+
+interface IPollConfigOptionRelations {
+    poll: ViewPoll;
+}
+export interface ViewPollOption extends ViewModelRelations<IPollConfigOptionRelations>, PollOption {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-ballot.ts
similarity index 58%
rename from client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts
rename to client/src/app/site/pages/meetings/pages/polls/view-models/view-ballot.ts
index ab4bf9ff72..65a16d75d1 100644
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-ballot.ts
@@ -1,17 +1,17 @@
 import { Id } from 'src/app/domain/definitions/key-types';
 
-import { Vote } from '../../../../../../domain/models/poll/vote';
+import { Ballot } from '../../../../../../domain/models/poll/ballot';
 import { BaseViewModel, ViewModelRelations } from '../../../../../base/base-view-model';
 import { HasMeeting } from '../../../view-models/has-meeting';
 import { ViewMeetingUser } from '../../../view-models/view-meeting-user';
 import { ViewUser } from '../../../view-models/view-user';
-import { ViewOption } from './view-option';
+import { ViewPoll } from '..';
 
-export class ViewVote extends BaseViewModel<Vote> {
-    public static COLLECTION = Vote.COLLECTION;
-    protected _collection = Vote.COLLECTION;
+export class ViewBallot extends BaseViewModel<Ballot> {
+    public static COLLECTION = Ballot.COLLECTION;
+    protected _collection = Ballot.COLLECTION;
 
-    public get vote(): Vote {
+    public get ballot(): Ballot {
         return this._model;
     }
 
@@ -24,10 +24,10 @@ export class ViewVote extends BaseViewModel<Vote> {
     }
 }
 
-interface IViewVoteRelations {
+interface IViewBallotRelations {
+    poll: ViewPoll;
     user?: ViewUser;
     delegated_user?: ViewMeetingUser;
-    option: ViewOption;
 }
 
-export interface ViewVote extends HasMeeting, ViewModelRelations<IViewVoteRelations>, Vote {}
+export interface ViewBallot extends HasMeeting, ViewModelRelations<IViewBallotRelations>, Ballot {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-option.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-option.ts
deleted file mode 100644
index 49c1a7c3d8..0000000000
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-option.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { _ } from '@ngx-translate/core';
-
-import { OptionData, OptionTitle } from '../../../../../../domain/models/poll/generic-poll';
-import { Option } from '../../../../../../domain/models/poll/option';
-import { BaseViewModel, ViewModelRelations } from '../../../../../base/base-view-model';
-import { HasMeeting } from '../../../view-models/has-meeting';
-import { ViewUser } from '../../../view-models/view-user';
-import { UnknownUserLabel } from '../../assignments/modules/assignment-poll/services/assignment-poll.service';
-import { isSortedList, SortedList } from './sorted-list';
-import { ViewPoll } from './view-poll';
-import { ViewVote } from './view-vote';
-export class ViewOption<C extends BaseViewModel = any> extends BaseViewModel<Option> implements OptionData {
-    public static COLLECTION = Option.COLLECTION;
-    protected _collection = Option.COLLECTION;
-
-    public get isListOption(): boolean {
-        return isSortedList(this.content_object);
-    }
-
-    public get contentTitlesAsSortedArray(): OptionTitle[] {
-        if (!this.isListOption) {
-            return [this.getOptionTitle()];
-        }
-        return (this.content_object as SortedList).entries
-            .sort((a, b) => a.weight - b.weight)
-            .map(entry => ({ title: entry.getTitle() ?? `No data`, subtitle: entry.getSubtitle() ?? `` }));
-    }
-
-    public getContentObject(): C | undefined {
-        return this.content_object;
-    }
-
-    public getOptionTitle(): OptionTitle {
-        if (this.text) {
-            return { title: this.text };
-        } else {
-            if (this.isListOption) {
-                return {
-                    title: this.content_object.getTitle()
-                };
-            } else if (this.content_object instanceof ViewUser) {
-                return {
-                    title: this.content_object.getShortName(),
-                    subtitle: this.content_object.getLevelAndNumber()
-                };
-            } else if (this.poll.isAssignmentPoll && !this.content_object_id) {
-                return {
-                    title: UnknownUserLabel,
-                    subtitle: ``
-                };
-            } else if (this.poll.isAssignmentPoll) {
-                return { title: `` };
-            } else {
-                return { title: this.content_object?.getTitle() ?? _(`No data`) };
-            }
-        }
-    }
-}
-
-interface IViewOptionRelations<C extends BaseViewModel = any> {
-    content_object?: C;
-    votes: ViewVote[];
-    poll: ViewPoll;
-    used_as_global_option_in_poll: ViewPoll;
-}
-
-export interface ViewOption extends HasMeeting, ViewModelRelations<IViewOptionRelations>, Option {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts
deleted file mode 100644
index 5230fea91e..0000000000
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list';
-import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
-
-import { HasMeeting } from '../../../view-models/has-meeting';
-import { SortedList, SortedListEntry } from './sorted-list';
-import { ViewOption } from './view-option';
-import { ViewPollCandidate } from './view-poll-candidate';
-
-export class ViewPollCandidateList extends BaseViewModel<PollCandidateList> implements SortedList {
-    public get entries(): SortedListEntry[] {
-        return this.poll_candidates;
-    }
-
-    public get poll_candidate_list(): PollCandidateList {
-        return this._model;
-    }
-
-    public static COLLECTION = PollCandidateList.COLLECTION;
-
-    public getShortenedTitle(length: number): string {
-        const title = this.getTitle();
-        if (length < 1) {
-            throw new Error(`Selected length of shortened title too small`);
-        } else if (title && length >= title?.length) {
-            return title;
-        }
-        return title.slice(0, length - 2) + `…`;
-    }
-}
-
-interface IPollCandidateListRelations {
-    poll_candidates: ViewPollCandidate[];
-    option: ViewOption;
-}
-export interface ViewPollCandidateList
-    extends HasMeeting, ViewModelRelations<IPollCandidateListRelations>, PollCandidateList {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts
deleted file mode 100644
index c0bf41c176..0000000000
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate';
-import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model';
-
-import { HasMeeting } from '../../../view-models/has-meeting';
-import { ViewUser } from '../../../view-models/view-user';
-import { SortedListEntry } from './sorted-list';
-import { ViewPollCandidateList } from './view-poll-candidate-list';
-
-export class ViewPollCandidate extends BaseViewModel<PollCandidate> implements SortedListEntry {
-    public get poll_candidate(): PollCandidate {
-        return this._model;
-    }
-
-    public static COLLECTION = PollCandidate.COLLECTION;
-
-    public getSubtitle(): string {
-        return this.user?.getLevelAndNumber() ?? ``;
-    }
-}
-
-interface IPollCandidateRelations {
-    poll_candidate_list: ViewPollCandidateList;
-    user: ViewUser;
-}
-export interface ViewPollCandidate extends HasMeeting, ViewModelRelations<IPollCandidateRelations>, PollCandidate {}
diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts
index 0955e10d57..27a1d8a97f 100644
--- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts
+++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts
@@ -1,33 +1,26 @@
 import { _ } from '@ngx-translate/core';
 import { DetailNavigable } from 'src/app/domain/interfaces';
-import {
-    PollClassType,
-    PollClassTypeVerbose,
-    PollContentObject,
-    PollData,
-    PollMethod,
-    PollPercentBaseVerbose,
-    PollStateChangeActionVerbose,
-    PollStateVerbose,
-    PollType,
-    PollTypeVerbose,
-    VOTE_MAJORITY
-} from 'src/app/domain/models/poll';
+import { Assignment } from 'src/app/domain/models/assignments/assignment';
+import { Motion } from 'src/app/domain/models/motions';
+import { PollContentObject, VOTE_MAJORITY } from 'src/app/domain/models/poll';
+import { BasePollConfigModel } from 'src/app/domain/models/poll/base-poll-config';
 import { Poll } from 'src/app/domain/models/poll/poll';
+import { PollConfigApproval } from 'src/app/domain/models/poll/poll-config-approval';
 import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default';
+import { Topic } from 'src/app/domain/models/topics/topic';
 import { ViewModelRelations } from 'src/app/site/base/base-view-model';
 import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants';
-import { ViewOption } from 'src/app/site/pages/meetings/pages/polls';
+import { ViewBallot, ViewPollOption } from 'src/app/site/pages/meetings/pages/polls';
 import { BaseProjectableViewModel, ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models';
 import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting';
-import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 
 import { MeetingSettingsService } from '../../../services/meeting-settings.service';
 import { SlideOptions } from '../../../view-models/slide-options';
+import { ViewMeetingUser } from '../../../view-models/view-meeting-user';
 
 export class ViewPoll<C extends PollContentObject = any>
     extends BaseProjectableViewModel<Poll>
-    implements DetailNavigable, PollData
+    implements DetailNavigable
 {
     private _hasVoted: boolean | undefined;
 
@@ -49,48 +42,20 @@ export class ViewPoll<C extends PollContentObject = any>
         return this._hasVoted;
     }
 
-    public get pollClassType(): PollClassType | undefined {
-        return this.content_object?.collection as PollClassType;
+    public get isListPoll(): boolean {
+        return this.config?.collection === PollConfigApproval.COLLECTION && !!this.options.length;
     }
 
     public get isAssignmentPoll(): boolean {
-        return this.content_object?.collection === PollClassType.Assignment;
-    }
-
-    public get isListPoll(): boolean {
-        return this.options[0]?.isListOption;
+        return this.content_object?.collection === Assignment.COLLECTION;
     }
 
     public get isMotionPoll(): boolean {
-        return this.content_object?.collection === PollClassType.Motion;
+        return this.content_object?.collection === Motion.COLLECTION;
     }
 
     public get isTopicPoll(): boolean {
-        return this.content_object?.collection === PollClassType.Topic;
-    }
-
-    public get percentBaseVerbose(): string {
-        return PollPercentBaseVerbose[this.onehundred_percent_base];
-    }
-
-    public get pollClassTypeVerbose(): string {
-        return this.pollClassType ? PollClassTypeVerbose[this.pollClassType] : ``;
-    }
-
-    public get stateVerbose(): string {
-        return PollStateVerbose[this.state];
-    }
-
-    public get nextStateActionVerbose(): string {
-        return PollStateChangeActionVerbose[this.nextState];
-    }
-
-    public get typeVerbose(): string {
-        const suffix = ``;
-        if (this.is_pseudoanonymized && this.type === PollType.Named) {
-            return _(`nominal (anonymized)`);
-        }
-        return PollTypeVerbose[this.type] + suffix;
+        return this.content_object?.collection === Topic.COLLECTION;
     }
 
     public getContentObjectTitle(): string | null {
@@ -114,16 +79,12 @@ export class ViewPoll<C extends PollContentObject = any>
     }
 
     public get hasVotes(): boolean {
-        return this.results
-            .flatMap(option => option.votes)
-            .some(vote => vote.weight > 0 || +vote.weight === VOTE_MAJORITY);
-    }
-
-    public hasVotedForDelegations(userId?: number): boolean {
-        if (!userId) {
-            return false;
-        }
-        return this.user_has_voted_for_delegations?.includes(userId);
+        // TODO: Check results property
+        return (
+            this.results
+                // .flatMap(option => option.votes)
+                .some(vote => vote.weight > 0 || +vote.weight === VOTE_MAJORITY)
+        );
     }
 
     public getContentObject(): C | undefined {
@@ -138,18 +99,12 @@ export class ViewPoll<C extends PollContentObject = any>
             { value: true, displayName: `Single votes` }
         ];
         const slideOptions: SlideOptions =
-            this.type === `named` &&
-            !this.is_pseudoanonymized &&
-            (this.isMotionPoll ||
-                (this.isAssignmentPoll &&
-                    !this.global_yes &&
-                    this.pollmethod === PollMethod.Y &&
-                    this.max_votes_amount === 1))
+            this.isNamed || this.isOpen
                 ? [
                       {
                           key: `single_votes`,
                           displayName: _(`Which visualization?`),
-                          default: !!this.live_voting_enabled,
+                          default: !!this.published, // TODO: Check if poll is live vote enabled
                           choices
                       }
                   ]
@@ -163,17 +118,19 @@ export class ViewPoll<C extends PollContentObject = any>
         };
     }
 
-    private get results(): ViewOption[] {
-        return (this.options || []).concat(this.global_option).filter(option => !!option);
+    private get results(): ViewPollOption[] {
+        // TODO: Concat gloabl option
+        return (this.options || []).filter(option => !!option);
     }
 }
 
-interface IPollRelations<C extends PollContentObject = any> {
+interface IPollRelations<C extends PollContentObject = any, D extends BasePollConfigModel = any> {
     content_object?: C;
-    voted: ViewUser[];
+    config: D;
+    voted: ViewMeetingUser[];
+    ballots: ViewBallot[];
     entitled_groups: ViewGroup[];
-    options: ViewOption[];
-    global_option: ViewOption;
+    options: ViewPollOption[];
 }
-export interface ViewPoll<C extends PollContentObject = any>
-    extends HasMeeting, ViewModelRelations<IPollRelations<C>>, Poll {}
+export interface ViewPoll<C extends PollContentObject = any, D extends BasePollConfigModel = any>
+    extends HasMeeting, ViewModelRelations<IPollRelations<C, D>>, Poll {}
diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
index d289dae50a..636bc57396 100644
--- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
+++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
@@ -3,17 +3,10 @@ import { _ } from '@ngx-translate/core';
 import { AgendaItemType } from 'src/app/domain/models/agenda/agenda-item';
 import { Settings } from 'src/app/domain/models/meetings/meeting';
 import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow';
-import {
-    PollBackendDurationChoices,
-    PollPercentBaseVerbose,
-    PollTypeVerbose
-} from 'src/app/domain/models/poll/poll-constants';
 import { ObjectReplaceKeysConfig } from 'src/app/infrastructure/utils';
 import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email';
 
 import { OrganizationSettingsService } from '../../../organization/services/organization-settings.service';
-import { AssignmentPollMethodVerbose } from '../../pages/assignments/modules/assignment-poll/definitions';
-import { MotionPollMethodVerbose } from '../../pages/motions/modules/motion-poll/definitions';
 import { ViewMeeting } from '../../view-models/view-meeting';
 
 export type SettingsValueMap = { [key in keyof Settings]?: any };
@@ -33,7 +26,7 @@ export type SettingsType =
     | `groups`
     | `daterange`;
 
-export type ChoicesMap = Record<string, string | number>;
+export type ChoicesMap = Record<string, string | number> | string[];
 
 /**
  * Need for settings that depend on models. The collection is resolved via the
@@ -800,7 +793,7 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                         key: `motion_poll_default_type`,
                         label: _(`Default voting type`),
                         type: `choice`,
-                        choices: PollTypeVerbose,
+                        choices: ['poll_visibility.manually', 'poll_visibility.open', 'poll_visibility.secret'],
                         restrictionFn: (orgaSettings, value: any): any => {
                             const isElectronicVotingEnabled = orgaSettings.instant(`enable_electronic_voting`);
                             if (!isElectronicVotingEnabled && typeof value !== `string`) {
@@ -820,26 +813,18 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                         label: _(`Default groups with voting rights`),
                         type: `groups`
                     },
-                    {
-                        key: `motion_poll_default_method`,
-                        label: _(`Default voting method`),
-                        type: `choice`,
-                        choices: MotionPollMethodVerbose
-                    },
                     {
                         key: `motion_poll_default_onehundred_percent_base`,
                         label: _(`Default 100 % base`),
                         type: `choice`,
-                        choices: PollPercentBaseVerbose
-                    },
-                    {
-                        key: `motion_poll_default_backend`,
-                        label: _(`Default voting duration`),
-                        type: `choice`,
-                        choices: PollBackendDurationChoices,
-                        helpText: _(
-                            `Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.`
-                        )
+                        choices: [
+                            'poll_percent_base.yes_no',
+                            'poll_percent_base.valid',
+                            'poll_percent_base.cast',
+                            'poll_percent_base.entitled',
+                            'poll_percent_base.entitled_present',
+                            'poll_percent_base.disabled'
+                        ]
                     },
                     {
                         key: `motion_poll_projection_name_order_first`,
@@ -911,7 +896,7 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                         key: `assignment_poll_default_type`,
                         label: _(`Default voting type`),
                         type: `choice`,
-                        choices: PollTypeVerbose,
+                        choices: ['poll_visibility.manually', 'poll_visibility.open', 'poll_visibility.secret'],
                         restrictionFn: (orgaSettings, value: any): any => {
                             const isElectronicVotingEnabled = orgaSettings.instant(`enable_electronic_voting`);
                             if (!isElectronicVotingEnabled && typeof value !== `string`) {
@@ -925,26 +910,18 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                         label: _(`Default groups with voting rights`),
                         type: `groups`
                     },
-                    {
-                        key: `assignment_poll_default_method`,
-                        label: _(`Default election method`),
-                        type: `choice`,
-                        choices: AssignmentPollMethodVerbose
-                    },
                     {
                         key: `assignment_poll_default_onehundred_percent_base`,
                         label: _(`Default 100 % base`),
                         type: `choice`,
-                        choices: PollPercentBaseVerbose
-                    },
-                    {
-                        key: `assignment_poll_default_backend`,
-                        label: _(`Default voting duration`),
-                        type: `choice`,
-                        choices: PollBackendDurationChoices,
-                        helpText: _(
-                            `Voting ends after short (some seconds/minutes) or long (some days/weeks) time period.`
-                        )
+                        choices: [
+                            'poll_percent_base.yes_no',
+                            'poll_percent_base.valid',
+                            'poll_percent_base.cast',
+                            'poll_percent_base.entitled',
+                            'poll_percent_base.entitled_present',
+                            'poll_percent_base.disabled'
+                        ]
                     },
                     {
                         key: `assignment_poll_enable_max_votes_per_option`,
diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts b/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts
index 351cd9776d..456c4817a1 100644
--- a/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts
+++ b/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts
@@ -11,7 +11,7 @@ import { ViewMotionSupporter } from '../pages/motions/modules/supporters/view-mo
 import { ViewMotionWorkingGroupSpeaker } from '../pages/motions/modules/working-group-speakers';
 import { ViewGroup } from '../pages/participants';
 import { ViewStructureLevel } from '../pages/participants/pages/structure-levels/view-models';
-import { ViewVote } from '../pages/polls';
+import { ViewBallot, ViewPoll } from '../pages/polls';
 import { ViewMeeting } from './view-meeting';
 import { ViewUser } from './view-user';
 
@@ -42,9 +42,10 @@ interface IMeetingUserRelations {
     submitted_motions: ViewMotionSubmitter[];
     motion_editors: ViewMotionEditor[];
     motion_working_group_speakers: ViewMotionWorkingGroupSpeaker[];
+    poll_voted: ViewPoll;
     vote_delegated_to: ViewMeetingUser;
     vote_delegations_from: ViewMeetingUser[];
-    vote_delegated_votes: ViewVote[];
+    vote_delegated_votes: ViewBallot[];
     structure_levels: ViewStructureLevel[];
 }
 export interface ViewMeetingUser extends MeetingUser, ViewModelRelations<IMeetingUserRelations> {}
diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting.ts b/client/src/app/site/pages/meetings/view-models/view-meeting.ts
index c5211298bb..58a239183d 100644
--- a/client/src/app/site/pages/meetings/view-models/view-meeting.ts
+++ b/client/src/app/site/pages/meetings/view-models/view-meeting.ts
@@ -38,9 +38,7 @@ import { ViewMotionSupporter } from '../pages/motions/modules/supporters';
 import { ViewMotionWorkingGroupSpeaker } from '../pages/motions/modules/working-group-speakers';
 import { ViewGroup } from '../pages/participants';
 import { ViewStructureLevel } from '../pages/participants/pages/structure-levels/view-models';
-import { ViewOption, ViewPoll, ViewVote } from '../pages/polls';
-import { ViewPollCandidate } from '../pages/polls/view-models/view-poll-candidate';
-import { ViewPollCandidateList } from '../pages/polls/view-models/view-poll-candidate-list';
+import { ViewBallot, ViewPoll } from '../pages/polls';
 import { ViewProjection, ViewProjector, ViewProjectorCountdown, ViewProjectorMessage } from '../pages/projectors';
 import { ViewUser } from './view-user';
 
@@ -192,10 +190,7 @@ interface IMeetingRelations {
     motion_states: ViewMotionState[];
     forwarded_motions: ViewMotion[];
     polls: ViewPoll[];
-    poll_candidates: ViewPollCandidate[];
-    poll_candidate_lists: ViewPollCandidateList[];
-    options: ViewOption[];
-    votes: ViewVote[];
+    votes: ViewBallot[];
     assignments: ViewAssignment[];
     assignment_candidates: ViewAssignmentCandidate[];
     chat_groups: ViewChatGroup[];
diff --git a/client/src/app/site/pages/meetings/view-models/view-user.ts b/client/src/app/site/pages/meetings/view-models/view-user.ts
index 0c1e5cc3ce..ed9d077aed 100644
--- a/client/src/app/site/pages/meetings/view-models/view-user.ts
+++ b/client/src/app/site/pages/meetings/view-models/view-user.ts
@@ -9,8 +9,7 @@ import { ViewCommittee } from '../../organization/pages/committees';
 import { ViewOrganization } from '../../organization/view-models/view-organization';
 import { ViewGroup } from '../pages/participants/modules/groups/view-models/view-group';
 import { ViewStructureLevel } from '../pages/participants/pages/structure-levels/view-models';
-import { ViewOption, ViewPoll, ViewVote } from '../pages/polls';
-import { ViewPollCandidate } from '../pages/polls/view-models/view-poll-candidate';
+import { ViewBallot, ViewPoll, ViewPollOption } from '../pages/polls';
 import { DelegationType } from './delegation-type';
 import { ViewMeeting } from './view-meeting';
 import { ViewMeetingUser } from './view-meeting-user';
@@ -376,7 +375,7 @@ export class ViewUser extends BaseViewModel<User> /* implements Searchable */ {
     /**
      * Returns all votes given by the user in a given meeting.
      */
-    public getAllVotes(meetingId?: number): ViewVote[] {
+    public getAllVotes(meetingId?: number): ViewBallot[] {
         const meetingID = meetingId ?? this.getEnsuredActiveMeetingId();
         return this.votes
             .filter(vote => vote.meeting_id === meetingID)
@@ -405,9 +404,8 @@ interface IUserRelations {
     meeting_users: ViewMeetingUser[];
     poll_voted: ViewPoll[];
     committee_managements: ViewCommittee[];
-    options: ViewOption[];
-    votes: ViewVote[];
-    poll_candidates: ViewPollCandidate[];
+    options: ViewPollOption[];
+    votes: ViewBallot[];
     gender?: ViewGender;
     history_positions: ViewHistoryPosition[];
 }
diff --git a/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.html b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.html
new file mode 100644
index 0000000000..3e3ddb9187
--- /dev/null
+++ b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.html
@@ -0,0 +1,25 @@
+<mat-list cdkDropList class="editable-list" (cdkDropListDropped)="drop($event)">
+    @for (item of items(); track item; let i = $index) {
+        <mat-list-item cdkDrag class="editable-list-item">
+            <mat-icon cdkDragHandle class="drag-handle" matListItemIcon>drag_indicator</mat-icon>
+            <span matListItemTitle>{{ item }}</span>
+            <button mat-icon-button matListItemMeta type="button" (click)="removeItem(i)">
+                <mat-icon>delete</mat-icon>
+            </button>
+            <div *cdkDragPreview class="drag-preview">{{ item }}</div>
+        </mat-list-item>
+    }
+    @if (items().length === 0) {
+        <mat-list-item>
+            <span class="empty-hint" matListItemTitle>{{ 'No items yet' | translate }}</span>
+        </mat-list-item>
+    }
+</mat-list>
+
+<mat-form-field class="add-field">
+    <mat-label>{{ placeholder() | translate }}</mat-label>
+    <input matInput [ngModel]="inputValue()" (keydown.enter)="addItem()" (ngModelChange)="inputValue.set($event)" />
+    <button mat-icon-button matSuffix type="button" [aria-label]="'Add item' | translate" (click)="addItem()">
+        <mat-icon>add</mat-icon>
+    </button>
+</mat-form-field>
diff --git a/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.scss b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.scss
new file mode 100644
index 0000000000..7a05484bf8
--- /dev/null
+++ b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.scss
@@ -0,0 +1,55 @@
+:host {
+    display: block;
+}
+
+.editable-list {
+    border: 1px solid var(--mat-divider-color, rgba(0 0 0 / 12%));
+    border-radius: 4px;
+    padding: 0;
+    margin-bottom: 8px;
+    min-height: 48px;
+}
+
+.editable-list-item {
+    border-bottom: 1px solid var(--mat-divider-color, rgba(0 0 0 / 6%));
+
+    &:last-child {
+        border-bottom: none;
+    }
+
+    .drag-handle {
+        cursor: grab;
+        flex-shrink: 0;
+    }
+}
+
+.empty-hint {
+    opacity: 0.5;
+    font-style: italic;
+}
+
+.add-field {
+    width: 100%;
+}
+
+.drag-preview {
+    padding: 0 16px;
+    height: 48px;
+    display: flex;
+    align-items: center;
+    background: var(--mat-list-item-container-color, white);
+    border-radius: 4px;
+    box-shadow: 0 4px 8px rgba(0 0 0 / 20%);
+}
+
+.cdk-drag-placeholder {
+    opacity: 0.3;
+}
+
+.cdk-drag-animating {
+    transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}
+
+.editable-list.cdk-drop-list-dragging .editable-list-item:not(.cdk-drag-placeholder) {
+    transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}
diff --git a/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.ts b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.ts
new file mode 100644
index 0000000000..4ac94010fc
--- /dev/null
+++ b/client/src/app/ui/modules/editable-list/components/editable-list/editable-list.component.ts
@@ -0,0 +1,60 @@
+import { CdkDragDrop, DragDropModule, moveItemInArray } from '@angular/cdk/drag-drop';
+import { ChangeDetectionStrategy, Component, input, model, signal } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
+import { TranslatePipe } from '@ngx-translate/core';
+
+/**
+ * An editable list of strings.
+ * Items are passed in via `[(items)]` two-way binding or separate `[items]` / `(itemsChange)`.
+ *
+ * Example:
+ * ```html
+ * <os-editable-list [(items)]="myItems" placeholder="Add option" />
+ * ```
+ */
+@Component({
+    selector: 'os-editable-list',
+    imports: [
+        DragDropModule,
+        FormsModule,
+        MatButtonModule,
+        MatIconModule,
+        MatInputModule,
+        MatListModule,
+        TranslatePipe
+    ],
+    templateUrl: './editable-list.component.html',
+    styleUrl: './editable-list.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class EditableListComponent {
+    public items = model<string[]>([]);
+    public placeholder = input<string>('Add item');
+
+    public readonly inputValue = signal<string>('');
+
+    public addItem(): void {
+        const val = this.inputValue().trim();
+        if (!val) {
+            return;
+        }
+        this.items.update(current => [...current, val]);
+        this.inputValue.set('');
+    }
+
+    public removeItem(index: number): void {
+        this.items.update(current => current.filter((_, i) => i !== index));
+    }
+
+    public drop(event: CdkDragDrop<string[]>): void {
+        this.items.update(current => {
+            const copy = [...current];
+            moveItemInArray(copy, event.previousIndex, event.currentIndex);
+            return copy;
+        });
+    }
+}
diff --git a/client/src/app/ui/modules/editable-list/index.ts b/client/src/app/ui/modules/editable-list/index.ts
new file mode 100644
index 0000000000..634e533eb2
--- /dev/null
+++ b/client/src/app/ui/modules/editable-list/index.ts
@@ -0,0 +1 @@
+export * from './components/editable-list/editable-list.component';
diff --git a/client/src/app/ui/pipes/pipes.module.ts b/client/src/app/ui/pipes/pipes.module.ts
index 44628ade68..c7e4fdcc28 100644
--- a/client/src/app/ui/pipes/pipes.module.ts
+++ b/client/src/app/ui/pipes/pipes.module.ts
@@ -9,6 +9,7 @@ import { ReversePipe } from './reverse/reverse.pipe';
 import { TimePipe } from './time/time.pipe';
 import { ToArrayPipe } from './to-array/to-array.pipe';
 import { ToStringPipe } from './to-string/to-string.pipe';
+import { TranslateKeyPipe } from './translate-key/translate-key.pipe';
 import { TrustPipe } from './trust/trust.pipe';
 
 const DECLARATIONS = [
@@ -24,9 +25,9 @@ const DECLARATIONS = [
 ];
 
 @NgModule({
-    exports: DECLARATIONS,
+    exports: [...DECLARATIONS, TranslateKeyPipe],
     declarations: DECLARATIONS,
-    imports: [CommonModule],
+    imports: [CommonModule, TranslateKeyPipe],
     providers: [SlicePipe, AsyncPipe]
 })
 export class PipesModule {}
diff --git a/client/src/app/ui/pipes/translate-key/translate-key.pipe.ts b/client/src/app/ui/pipes/translate-key/translate-key.pipe.ts
new file mode 100644
index 0000000000..eb6a9b3ce2
--- /dev/null
+++ b/client/src/app/ui/pipes/translate-key/translate-key.pipe.ts
@@ -0,0 +1,16 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslatePipe } from '@ngx-translate/core';
+import { KeyedTranslations } from 'src/app/domain/translations';
+
+@Pipe({
+    name: `translateKey`
+})
+export class TranslateKeyPipe extends TranslatePipe implements PipeTransform {
+    public override transform(query: string | undefined | null, prefix?: string, ...args: any[]): any {
+        if (prefix) {
+            query = `${prefix}.${query}`;
+        }
+
+        return super.transform(KeyedTranslations[query] ?? query, ...args);
+    }
+}