diff --git a/backend/.eslintrc.json b/backend/.eslintrc.json
index 6e90a9b2b..e2d59d70a 100644
--- a/backend/.eslintrc.json
+++ b/backend/.eslintrc.json
@@ -31,6 +31,7 @@
         "quotes": ["error", "single"],
         "comma-dangle": ["error", "never"],
         "no-duplicate-imports": "error",
+        "no-underscore-dangle": "off",
         "no-tabs": ["error", { "allowIndentationTabs": true }]
     }
 }
diff --git a/backend/src/serverHelper.js b/backend/src/serverHelper.js
index 84fd03898..a8901bf40 100644
--- a/backend/src/serverHelper.js
+++ b/backend/src/serverHelper.js
@@ -161,8 +161,7 @@ async function deleteFeatureFile(storyTitle, storyId) {
 function getSettings(scenario, globalSettings) {
 	const finalSettings = {
 		browser: scenario.browser || 'chrome',
-		waitTime: scenario.stepWaitTime || 0,
-		daisyAutoLogout: scenario.daisyAutoLogout || false
+		waitTime: scenario.stepWaitTime || 0
 	};
 
 	// if globalSettings are activated, then use global values
@@ -299,8 +298,6 @@ function scenarioPrep(scenarios, driver, globalSettings) {
 		if (!scenario.stepWaitTime) scenario.stepWaitTime = 0;
 		// eslint-disable-next-line no-param-reassign
 		if (!scenario.browser) scenario.browser = 'chrome';
-		// eslint-disable-next-line no-param-reassign
-		if (!scenario.daisyAutoLogout) scenario.daisyAutoLogout = false;
 
 		const additionalParams = getSettings(scenario, globalSettings);
 
diff --git a/backend/src/serverRouter/storyRouter.js b/backend/src/serverRouter/storyRouter.js
index d0a246619..8b46689e4 100644
--- a/backend/src/serverRouter/storyRouter.js
+++ b/backend/src/serverRouter/storyRouter.js
@@ -69,10 +69,10 @@ router.get('/issueKey/:issue_key', async (req, res) => {
 // create Story
 router.post('/', async (req, res) => {
 	try {
-		const db_id = await mongo.createStory(req.body.title, req.body.description, req.body._id);
-		await mongo.insertStoryIdIntoRepo(db_id, req.body._id);
-		helper.updateFeatureFile(db_id);
-		res.status(200).json(db_id);
+		const dbId = await mongo.createStory(req.body.title, req.body.description, req.body._id);
+		await mongo.insertStoryIdIntoRepo(dbId, req.body._id);
+		helper.updateFeatureFile(dbId);
+		res.status(200).json(dbId);
 	} catch (e) {
 		handleError(res, e, e, 500);
 	}
@@ -175,7 +175,12 @@ router.delete('/:repo_id/:_id', async (req, res) => {
 router.post('/upload/import/', upload.single('file'), async (req, res) => {
 	try {
 		if (req.query.projectName) {
-			const result = pmHelper.importProject(req.file, req.query.repo_id, req.query.projectName, req.query.importMode);
+			const result = pmHelper.importProject(
+				req.file,
+				req.query.repo_id,
+				req.query.projectName,
+				req.query.importMode
+			);
 			res.status(200).json(result);
 		} else res.status(200).json('');
 	} catch (error) {
@@ -187,7 +192,12 @@ router.post('/upload/import/', upload.single('file'), async (req, res) => {
 router.put('/upload/import/', upload.single('file'), async (req, res) => {
 	try {
 		if (req.query.repo_id) {
-			const result = pmHelper.importProject(req.file, req.query.repo_id, req.query.projectName, req.query.importMode);
+			const result = pmHelper.importProject(
+				req.file,
+				req.query.repo_id,
+				req.query.projectName,
+				req.query.importMode
+			);
 			res.status(200).json(result);
 		} else res.status(200).json('');
 	} catch (error) {
@@ -297,7 +307,7 @@ router.delete('/scenario/:story_id/:_id', async (req, res) => {
 	}
 
 	if (!dbError && !xrayError) res.status(200).json({ text: 'Scenario successfully deleted.' });
-	 else {
+	else {
 		let errorMessage = 'Error during deletion: ';
 		if (dbError) errorMessage += 'Database error. ';
 		if (xrayError) errorMessage += 'Error deleting XRay step.';
diff --git a/frontend/src/app/account-management/account-management.component.css b/frontend/src/app/account-management/account-management.component.css
index 8bbfa15d5..1338cc9fb 100644
--- a/frontend/src/app/account-management/account-management.component.css
+++ b/frontend/src/app/account-management/account-management.component.css
@@ -229,7 +229,7 @@ h2, h1{
     margin-left: 5px;;
 }
 
-.customRepoContainer{
+.projectListItem{
     display: flex;
     justify-content: flex-start;
 }
diff --git a/frontend/src/app/account-management/account-management.component.html b/frontend/src/app/account-management/account-management.component.html
index 3218a7c49..074fff4b7 100644
--- a/frontend/src/app/account-management/account-management.component.html
+++ b/frontend/src/app/account-management/account-management.component.html
@@ -28,7 +28,7 @@ <h2 class="LargeHeadline3">Seed-Test Account</h2>
                 <label class="MediumHeadline5">Custom Projects:</label>
                 <ul class="uk-list">
                     <ng-container *ngFor="let repository of repositories; let i = index">
-                        <li class="customRepoContainer" *ngIf="this.apiService.isCustomRepo(repository)">
+                        <li class="projectListItem" *ngIf="this.apiService.isCustomRepo(repository)">
                             <div class="db-item-list">
                                 <img class="repo_img" *ngIf="this.apiService.isCustomRepo(repository)"
                                     src="../assets/database-5-32.png">
@@ -127,10 +127,14 @@ <h2 class="LargeHeadline3" [ngStyle]="{ 'opacity': clientId==='undefined' ? '0.5
                 <label class="MediumHeadline5">Github Projects:</label>
                 <ul class="uk-list">
                     <ng-container *ngFor="let repository of repositories; let i = index">
-                        <li *ngIf="this.apiService.isGithubRepo(repository)">
-                            <img class="repo_img" *ngIf="this.apiService.isGithubRepo(repository)" src="../assets/GitHub-Mark-32px.png" alt="github">
-                            <a class="MediumBody2 repoLink" id="github_{{'repository_'+i}}" (click)="selectRepository(repository);" >{{repository.value}}</a>
-                            <mat-icon class="set-name-button setting-icon" id="edit_{{'repository_'+i}}" (click)="workGroupEdit(repository)" data-uk-tooltip title="Edit project">settings</mat-icon>
+                        <li class="projectListItem" *ngIf="this.apiService.isGithubRepo(repository)">
+                            <div class="db-item-list">
+                                <img class="repo_img" *ngIf="this.apiService.isGithubRepo(repository)" src="../assets/GitHub-Mark-32px.png" alt="github">
+                                <a class="MediumBody2 repoLink" id="github_{{'repository_'+i}}" (click)="selectRepository(repository);" >{{repository.value}}</a>
+                            </div>
+                            <span class="flex-end-item">
+                                <mat-icon class="set-name-button setting-icon" id="edit_{{'repository_'+i}}" (click)="workGroupEdit(repository)" data-uk-tooltip title="Edit project">settings</mat-icon>
+                            </span>
                         </li>
                     </ng-container>
                 </ul>
@@ -165,11 +169,15 @@ <h2 class="LargeHeadline3">Jira</h2>
                 <label class="MediumHeadline5">Jira Projects:</label>
                 <ul class="uk-list">
                     <ng-container *ngFor="let repository of repositories; let i = index">
-                        <li *ngIf="this.apiService.isJiraRepo(repository)">
-                            <img class="repo_img" *ngIf="this.apiService.isJiraRepo(repository)" src="../assets/jira-logo-gradient-blue@2x-300x177.png" alt="jira">
-                            <a class="MediumBody2 repoLink" id="jira_{{'repository_'+i}}" (click)="selectRepository(repository);" >{{repository.value}}</a>
-                            <mat-icon class="set-name-button setting-icon" id="edit_{{'repository_'+i}}" (click)="workGroupEdit(repository)" data-uk-tooltip title="Edit project">settings</mat-icon>
-                        </li>
+                        <li class="projectListItem" *ngIf="this.apiService.isJiraRepo(repository)">
+                            <div class="db-item-list">
+                                <img class="repo_img" *ngIf="this.apiService.isJiraRepo(repository)" src="../assets/jira-icon.png" alt="jira">
+                                <a class="MediumBody2 repoLink" id="jira_{{'repository_'+i}}" (click)="selectRepository(repository);" >{{repository.value}}</a>
+                            </div>
+                            <span class="flex-end-item">
+                                <mat-icon class="set-name-button setting-icon" id="edit_{{'repository_'+i}}" (click)="workGroupEdit(repository)" data-uk-tooltip title="Edit project">settings</mat-icon>
+                            </span>
+                           </li>
                     </ng-container>
                 </ul>
             </div>
diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index d6743e277..535137d65 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -14,7 +14,7 @@
                     <img class="repo_img" *ngIf="this.apiService.isGithubRepo(repository)"
                       src="../assets/GitHub-Mark-32px.png" alt="github">
                     <img class="repo_img" *ngIf="this.apiService.isJiraRepo(repository)"
-                      src="../assets/jira-logo-gradient-blue@2x-300x177.png" alt="jira">
+                      src="../assets/jira-icon.png" alt="jira">
                     <img class="repo_img" *ngIf="this.apiService.isCustomRepo(repository)"
                       src="../assets/database-5-32.png" alt="database">
                     <a id="{{'repository_' + i}}" (click)="selectRepository(repository)"
@@ -68,23 +68,18 @@ <h4 id="seedTest">
           [ngClass]="{'mat-checked mat-slide-toggle-bar':isDark}" title="Switch to dark/light mode"></mat-slide-toggle>
         <mat-icon>bedtime</mat-icon>
       </div>
-      <div>
-        <div class="dropdown">
-          <button class="rightButton">Help</button>
-          <div #helpMenu [class.closedMenu]="closed">
-            <div class="dropdown-list">
-              <a rel="noopener noreferrer" href="https://github.com/adessoAG/Seed-Test/wiki/Tutorial_deu"
-                target="_blank">Tutorial (german)</a>
-              <a rel="noopener noreferrer" href="https://github.com/adessoAG/Seed-Test/wiki/Tutorial_eng"
-                target="_blank">Tutorial (english)</a>
-              <a rel="noopener noreferrer" href="../assets/documentation/index.html"
-                target="_blank">Dokumentation (german)</a>
-            </div>
+      <div class="dropdown">
+        <button class="rightButton">Help</button>
+        <div #helpMenu [class.closedMenu]="closed">
+          <div class="dropdown-list">
+            <a rel="noopener noreferrer" href="https://github.com/adessoAG/Seed-Test/wiki/Tutorial_deu"
+              target="_blank">Tutorial (german)</a>
+            <a rel="noopener noreferrer" href="https://github.com/adessoAG/Seed-Test/wiki/Tutorial_eng"
+              target="_blank">Tutorial (english)</a>
+            <a rel="noopener noreferrer" href="../assets/documentation/index.html"
+              target="_blank">Dokumentation (german)</a>
           </div>
         </div>
-        <a routerLink="/feedback">
-          <button class="rightButton">Feedback</button>
-        </a>
       </div>
     </div>
   </div>
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 23677573a..c05a7f396 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { EditableOnEnterDirective } from "./directives/edit-on-enter.directive";
 import { FocusableDirective } from "./editable/focusable.directive";
 import { DragDropModule } from "@angular/cdk/drag-drop";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
-import { FeedbackComponent } from "./feedback/feedback.component";
 import { TermsComponent } from "./terms/terms.component";
 import { StoryEditorComponent } from "./story-editor/story-editor.component";
 import { AccountManagementComponent } from "./account-management/account-management.component";
@@ -104,7 +103,6 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
     EditableComponent,
     FocusableDirective,
     EditableOnEnterDirective,
-    FeedbackComponent,
     TermsComponent,
     AccountManagementComponent,
     StoryEditorComponent,
diff --git a/frontend/src/app/base-editor/base-editor.component.css b/frontend/src/app/base-editor/base-editor.component.css
index 58f75910c..4e0fc7f70 100644
--- a/frontend/src/app/base-editor/base-editor.component.css
+++ b/frontend/src/app/base-editor/base-editor.component.css
@@ -506,11 +506,11 @@ input.background {
 }
 
 .origin-container {
-    margin-left: 10px;  
-    padding: 5px 5px;  
+    margin-left: 5px;  
+    padding: 0px 5px 0px 2px; 
     border: 3px solid var(--ocean-blue);
-	font-size: 12px; 
-    border-radius: 10px; 
+	font-size: 16px; 
+    border-radius: 20px; 
     display: inline-block; 
     background-color: #f9f9f9; 
     font-style: italic;
@@ -522,11 +522,11 @@ input.background {
     align-items: center;
     padding: 10px 10px;
     border-radius: 5px;
-    cursor: pointer;
-    font-size: 13px;
+    /* cursor: pointer; */
+    font-size: 14px;
     font-weight: bold;
     font-style: italic;
-    color: var(--ocean-blue);
+    color: #2ab34b;
 	margin-right: 10px;
 }
 
diff --git a/frontend/src/app/base-editor/base-editor.component.html b/frontend/src/app/base-editor/base-editor.component.html
index dc6370558..8df39c3e5 100644
--- a/frontend/src/app/base-editor/base-editor.component.html
+++ b/frontend/src/app/base-editor/base-editor.component.html
@@ -51,7 +51,7 @@
 			</div>
 			<div class="scenarioButtonGroup SmallHeadline5">
         <button *ngIf="name === 'scenario' && this.selectedScenario.testKey" class="xray-button">
-          <span>Sync with</span>
+          <span>Synced with</span>
           <img src="../../assets/xray-logo.png" alt="XRay Logo">
         </button>
 				<button type="button" class="scenarioButton" [class.disabled]="this.clipboardBlock === null"
@@ -113,7 +113,7 @@
         </ng-container>
         <ng-template #steps let-sd let-i="index" let-stepDefs="stepDefs" , let-name="templateName">
           <div class="stepsListContainer SmallHeadline5">
-            <div *ngIf="sd === 'given'">{{i+1}}. Given (Precondition)</div>
+            <div *ngIf="sd === 'given'">{{i+1}}. Given (Pre-Condition)</div>
             <div *ngIf="sd === 'when'">{{i+1}}. When (Action)</div>
             <div *ngIf="sd === 'then'">{{i+1}}. Then (Result)</div>
           </div>
@@ -279,8 +279,19 @@
                         </ng-container>
                       </div>
                     </div>
-                    <div *ngIf="this.selectedScenario.testKey" class="origin-container">
+                    <!-- congrunt / Irigoin Button -->
+                    <div *ngIf="this.selectedScenario.testKey">
+                      <div *ngIf="currentStep.origin === 'congruent'" class="origin-container" style="border: 3px solid #2ab34b; ">
+                        <img src="../../assets/xray-icon.png" alt="XRay origin" style="max-width: 18px; margin-top: -2px;">
+                        Xray
+                      </div>
+                      <div *ngIf="currentStep.origin === 'created-by-user'" class="origin-container">
+                        <img src="../../assets/icon-quad.png" alt="XRay origin" style="max-width: 18px; margin-top: -2px;">
+                        Seed
+                        </div>
+                      <div *ngIf="currentStep.origin !== 'congruent' && currentStep.origin !== 'created-by-user'" class="origin-container">
                       {{ currentStep.origin || 'Unknown Origin' }}
+                      </div>
                     </div>
                     <div *ngIf="currentStep.selectionValue==2">
                       <mat-form-field appearance="standard">
@@ -313,7 +324,7 @@
                           {{ currentStep.values[index].indexOf('<') !== -1 && currentStep.values[index].indexOf('>') !== -1 ? '<  ' + currentStep.values[index].replace('<', '').replace('>', '') + '  >' : currentStep.values[index]}}
                         </div>                  
                       </div>
-                      <button *ngIf="name!=='block-editor'"
+                      <button *ngIf="name!=='block-editor' && this.selectedScenario.multipleScenarios[0] !== undefined"
                         class="scenarioTitle" (click)="addIsExample('example', j, index, currentStep.stepType)"
                         uk-tooltip="title: Use Multiple Scenarios; pos: right">
                         &nbsp;<p class="exampleButton">1+</p>&nbsp;
diff --git a/frontend/src/app/base-editor/base-editor.component.spec.ts b/frontend/src/app/base-editor/base-editor.component.spec.ts
index 2fe984d1f..eeea5b284 100644
--- a/frontend/src/app/base-editor/base-editor.component.spec.ts
+++ b/frontend/src/app/base-editor/base-editor.component.spec.ts
@@ -40,7 +40,7 @@ let stories : Story[]= [{"story_id": 123,"_id":2,"storySource":"github", "backgr
 
 const scenarios:Scenario[] = [{scenario_id: 2, name: 'my first scenario', stepDefinitions: {"when":[{"_id":'5dce728851e70f2894a170b4',"id": 6, "stepType":"when", "type" :"HoverOverAndSelect", "pre":"I hover over the element", "mid":"and select the option","values":["",""], "post":"", "isExample":[]}], "given":[{"_id":'5dce728851e70f2894a170b4',"id": 6, "stepType":"when", "type" :"HoverOverAndSelect", "pre":"I hover over the element", "mid":"and select the option","values":["",""], "post":"", "isExample":[]}],"then":[], "example": []},
   comment: 'write some words about this scenario', lastTestPassed: false,
-  saved: true, daisyAutoLogout: true, stepWaitTime: 200, browser: 'chrome'}]
+  saved: true, stepWaitTime: 200, browser: 'chrome'}]
 
 describe('BaseEditorComponent', () => {
   let component: BaseEditorComponent;
diff --git a/frontend/src/app/feedback/feedback.component.css b/frontend/src/app/feedback/feedback.component.css
deleted file mode 100644
index e72ddcf12..000000000
--- a/frontend/src/app/feedback/feedback.component.css
+++ /dev/null
@@ -1,5 +0,0 @@
-iframe{
-    display: block;
-    margin: 0 auto;
-}
-
diff --git a/frontend/src/app/feedback/feedback.component.html b/frontend/src/app/feedback/feedback.component.html
deleted file mode 100644
index 348e0fc11..000000000
--- a/frontend/src/app/feedback/feedback.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="parent"> 
-  <iframe title="Feedback Form" src="https://docs.google.com/forms/d/e/1FAIpQLSfYPspTNPqULoODz9p9wbM4TDWQTNoW6o6qy2ISzwVEr20bUw/viewform?embedded=true" 
-  width="640" height="1744" >Wird geladen…
-</iframe>
-</div>
diff --git a/frontend/src/app/feedback/feedback.component.spec.ts b/frontend/src/app/feedback/feedback.component.spec.ts
deleted file mode 100644
index b9363729f..000000000
--- a/frontend/src/app/feedback/feedback.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FeedbackComponent } from './feedback.component';
-
-describe('FeedbackComponent', () => {
-  let component: FeedbackComponent;
-  let fixture: ComponentFixture<FeedbackComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ FeedbackComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FeedbackComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/feedback/feedback.component.ts b/frontend/src/app/feedback/feedback.component.ts
deleted file mode 100644
index 8b27c1cc2..000000000
--- a/frontend/src/app/feedback/feedback.component.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Component, Input, OnInit, Output } from '@angular/core';
-
-
-/**
- * Component for the feedback of the user
- */
-@Component({
-  selector: 'app-feedback',
-  templateUrl: './feedback.component.html',
-  styleUrls: ['./feedback.component.css']
-})
-export class FeedbackComponent implements OnInit {
-
-
-  
-  /**
-   * @ignore
-   */
-  constructor() {
-  
-   }
-  /**
-   * @ignore
-   */
-  ngOnInit() {
-  }
-}
diff --git a/frontend/src/app/modals/repo-swich/repo-swich.component.html b/frontend/src/app/modals/repo-swich/repo-swich.component.html
index 08591e75d..f5043f3de 100644
--- a/frontend/src/app/modals/repo-swich/repo-swich.component.html
+++ b/frontend/src/app/modals/repo-swich/repo-swich.component.html
@@ -40,7 +40,7 @@
                                             <div>
                                                 <img class="repo_img" alt="Database Project" *ngIf="element.source ==='db'" src="../assets/database-5-32.png">
                                                 <img class="repo_img" alt="Github Project" *ngIf="element.source ==='github'" src="../assets/GitHub-Mark-32px.png">
-                                                <img class="repo_img" alt="Jira Project" *ngIf="element.source === 'jira'" src="../assets/jira-logo-gradient-blue@2x-300x177.png">
+                                                <img class="repo_img" alt="Jira Project" *ngIf="element.source === 'jira'" src="../assets/jira-icon.png">
                                                 <a class="MediumBody2 repoLink" id="db_{{'element_'+i}}" (click)="selectRepository(element);" >{{element.value}}</a>
                                             </div>
                                         </li>
diff --git a/frontend/src/app/model/Scenario.ts b/frontend/src/app/model/Scenario.ts
index 3d58d727e..ae5758f07 100644
--- a/frontend/src/app/model/Scenario.ts
+++ b/frontend/src/app/model/Scenario.ts
@@ -36,11 +36,6 @@ export interface Scenario {
      */
     saved?: boolean;
 
-    /**
-     * If the daisy Auto Logout is active
-     */
-    daisyAutoLogout?: boolean;
-
     /**
      * Wait time between the steps
      */
diff --git a/frontend/src/app/parent/parent.component.spec.ts b/frontend/src/app/parent/parent.component.spec.ts
index cce2a045a..3d36cc9b2 100644
--- a/frontend/src/app/parent/parent.component.spec.ts
+++ b/frontend/src/app/parent/parent.component.spec.ts
@@ -15,7 +15,7 @@ const story:Story = {_id: 1, issue_number: 36523, story_id: 37727, storySource:
       state: '', assignee: 'alice', assignee_avatar_url: 'url/to/my/photo', lastTestPassed: false};
 
 const scenario: Scenario = {scenario_id: 3, name: 'my scenario', stepDefinitions: undefined, 
-      comment: 'i leave a few words here', lastTestPassed: false, saved: true, daisyAutoLogout: true,
+      comment: 'i leave a few words here', lastTestPassed: false, saved: true,
       stepWaitTime: 40, browser: 'chrome'};
 
 
diff --git a/frontend/src/app/routes/routes.ts b/frontend/src/app/routes/routes.ts
index 07271ff85..cf910bbe1 100644
--- a/frontend/src/app/routes/routes.ts
+++ b/frontend/src/app/routes/routes.ts
@@ -2,7 +2,6 @@ import { LoginComponent } from '../login/login.component';
 import {AccountManagementComponent} from '../account-management/account-management.component';
 import { ParentComponent } from '../parent/parent.component';
 import { AuthGuard } from '../guards/auth.guard';
-import { FeedbackComponent } from '../feedback/feedback.component';
 import { TermsComponent } from '../terms/terms.component';
 import { RegistrationComponent } from '../registration/registration.component';
 import { ReportComponent } from '../report/report.component';
@@ -46,14 +45,6 @@ export const ROUTES = [
         component: ReportComponent
     },
 
-    /**
-     * Feedback
-     */
-    {
-        path: 'feedback',
-        component: FeedbackComponent
-    },
-
     /**
      * Terms
      */
diff --git a/frontend/src/app/scenario-editor/scenario-editor.component.css b/frontend/src/app/scenario-editor/scenario-editor.component.css
index 3efd904d7..056921a9f 100644
--- a/frontend/src/app/scenario-editor/scenario-editor.component.css
+++ b/frontend/src/app/scenario-editor/scenario-editor.component.css
@@ -129,13 +129,4 @@ table {
 :host ::ng-deep .comment > textarea {
   width: 100%;
   height: 50px;
-}
-
-:host ::ng-deep .daisyAutoLogout{
-  column-width: 100px;
-  float:right;
-}
-
-:host ::ng-deep #daisyAutoLogout{
-  margin-left: 5px;
-}
+}
\ No newline at end of file
diff --git a/frontend/src/app/scenario-editor/scenario-editor.component.html b/frontend/src/app/scenario-editor/scenario-editor.component.html
index 68a3035b1..c956cc467 100644
--- a/frontend/src/app/scenario-editor/scenario-editor.component.html
+++ b/frontend/src/app/scenario-editor/scenario-editor.component.html
@@ -3,7 +3,7 @@
   <div class="title">
     <div class="scenarioHeaderContainer">
       <div style="margin: auto 0">
-        <span id="scenarioHeader" class="Smallnavigation2">Scenario</span>
+        <span id="scenarioHeader" class="Smallnavigation2">Scenario&nbsp;</span>
           <dfn class="def"><span class="infoIcon uk-icon" uk-icon="info"></span>
             <span rel="def">Each scenario is an example describing a specific behavioral aspect of the system.
               It makes statements about how the system behaves when a particular action is executed taking into account certain preconditions.
@@ -63,10 +63,6 @@
     <textarea *ngIf="this.selectedScenario" id="commentBox" cols="50" rows="5" #comment type="text" value="{{selectedScenario.comment}}" (change)="commentChange(comment.value)">
     </textarea>
   </div>
-  <form class="daisyAutoLogout" *ngIf="this.showDaisyAutoLogout">
-    <label>Auto Logout (Daisy)</label>
-    <input type="checkbox" id="daisyAutoLogout" (change)="this.setDaisyAutoLogout($event.target.checked)" [defaultChecked]="this.selectedScenario.daisyAutoLogout">
-  </form>
 </div>
 
 <app-rename-scenario #renameScenarioModal></app-rename-scenario>
diff --git a/frontend/src/app/scenario-editor/scenario-editor.component.spec.ts b/frontend/src/app/scenario-editor/scenario-editor.component.spec.ts
index 0db796ba2..4b80a0f77 100644
--- a/frontend/src/app/scenario-editor/scenario-editor.component.spec.ts
+++ b/frontend/src/app/scenario-editor/scenario-editor.component.spec.ts
@@ -12,7 +12,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 const scenarios:Scenario[] = [{scenario_id: 2, name: 'my first scenario', stepDefinitions: {"when":[{"_id":'5dce728851e70f2894a170b4',"id": 6, "stepType":"when", "type" :"HoverOverAndSelect", "pre":"I hover over the element", "mid":"and select the option","values":["",""], "post":"", "isExample":[]}], "given":[{"_id":'5dce728851e70f2894a170b4',"id": 6, "stepType":"when", "type" :"HoverOverAndSelect", "pre":"I hover over the element", "mid":"and select the option","values":["",""], "post":"", "isExample":[]}],"then":[], "example": []},
                             comment: 'write some words about this scenario', lastTestPassed: false,
-                          saved: true, daisyAutoLogout: true, stepWaitTime: 200, browser: 'chrome'}]
+                          saved: true, stepWaitTime: 200, browser: 'chrome'}]
 
 
 describe('ScenarioEditorComponent', () => {
diff --git a/frontend/src/app/scenario-editor/scenario-editor.component.ts b/frontend/src/app/scenario-editor/scenario-editor.component.ts
index 6b9296163..14c500581 100644
--- a/frontend/src/app/scenario-editor/scenario-editor.component.ts
+++ b/frontend/src/app/scenario-editor/scenario-editor.component.ts
@@ -35,13 +35,7 @@ export class ScenarioEditorComponent implements OnInit{
         public blockService: BlockService,
         public scenarioService: ScenarioService,
         public toastr: ToastrService
-    ) {
-        if (localStorage.getItem('version') == 'DAISY') {
-            this.showDaisyAutoLogout = true;
-        } else {
-            this.showDaisyAutoLogout = false;
-        }
-    }
+    ) {}
 
     /**
      * Sets a new selected story
@@ -84,12 +78,6 @@ export class ScenarioEditorComponent implements OnInit{
      */
     arrowRight = true;
 
-
-    /**
-     * If this is the daisy version and the auto logout should be shown
-     */
-    showDaisyAutoLogout = false;
-
     /**
      * Current step of scenario as ngModel for dropdown
      */
@@ -160,10 +148,7 @@ export class ScenarioEditorComponent implements OnInit{
     @Output()
     runTestScenarioEvent: EventEmitter<any> = new EventEmitter();
 
-    @Output()
-    diasyLoginChanged: EventEmitter<any> = new EventEmitter();
-
-  /**
+   /**
     * Subscribes to all necessary events
     */
     ngOnInit() {
@@ -441,16 +426,6 @@ export class ScenarioEditorComponent implements OnInit{
         }
     }
 
-    /**
-     * Sets the daisy auto logout
-     * @param $event
-     * @param checkValue
-     */
-    setDaisyAutoLogout(checkValue: boolean) {
-        this.selectedScenario.daisyAutoLogout = checkValue;
-        this.selectedScenario.saved = false;
-    }
-
     /**
      * Change the comment
      * @param newComment
diff --git a/frontend/src/app/stories-bar/stories-bar.component.html b/frontend/src/app/stories-bar/stories-bar.component.html
index 862d99f3b..0bc9a4662 100644
--- a/frontend/src/app/stories-bar/stories-bar.component.html
+++ b/frontend/src/app/stories-bar/stories-bar.component.html
@@ -69,8 +69,8 @@
                 <button uk-tooltip="Go to Jira/Github" class="toTicket" (click)="toTicket(s.issue_number)">
                   <mat-icon class="toTicket">launch</mat-icon>
                 </button>
-                <img *ngIf="s.assignee_avatar_url == null || this.daisyVersion" src="assets/unassigned_avatar.png" alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="Unassigned">
-                <img *ngIf="!this.daisyVersion && s.assignee_avatar_url != null" [src]=s.assignee_avatar_url alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="{{s.assignee}}">
+                <img *ngIf="s.assignee_avatar_url == null" src="assets/unassigned_avatar.png" alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="Unassigned">
+                <img *ngIf="s.assignee_avatar_url != null" [src]=s.assignee_avatar_url alt="assignee github avatar" width="20px" height="20px" uk-tooltip="pos:right; delay: 200" title="{{s.assignee}}">
               </span>
               <em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
               <a class="storyListLink" maxlength="10" id="{{'story' + i}}" uk-tooltip="pos:right; delay: 200" title="{{s.title}}">
@@ -134,10 +134,10 @@
               </span>
             </div>
             <ul class="uk-accordion-content" (cdkDropListDropped)="dropGroupStory($event, g)" cdkDropList cdkDropListLockAxis="y">
-                <li *ngFor="let stor of g.member_stories" (click)="selectStoryOfGroup(stor._id)">
+                <li *ngFor="let story of g.member_stories" (click)="selectStoryOfGroup(story._id)">
                 <a class="Largecaption scenarioListItem" cdkDrag>
                     <em class="drag-handle material-icons" size="18px" cdkDragHandle>drag_handle</em>
-                    {{stor.title | titlecase}}
+                    {{story.issue_number}} {{story.title | titlecase}}
                   </a>
                 </li>
               </ul>
diff --git a/frontend/src/app/stories-bar/stories-bar.component.ts b/frontend/src/app/stories-bar/stories-bar.component.ts
index a28c34d7f..fa60052da 100644
--- a/frontend/src/app/stories-bar/stories-bar.component.ts
+++ b/frontend/src/app/stories-bar/stories-bar.component.ts
@@ -49,11 +49,6 @@ export class StoriesBarComponent implements OnInit, OnDestroy {
      */
     isCustomStory = false;
 
-    /**
-     * If it is the daisy version
-     */
-    daisyVersion = true;
-
     /**
      * Subscription element if a custom story should be created
      */
@@ -206,18 +201,8 @@ export class StoriesBarComponent implements OnInit, OnDestroy {
         });
 
         const version = localStorage.getItem('version');
-        if (version == 'DAISY' || !version) {
-            this.daisyVersion = true;
-        } else {
-            this.daisyVersion = false;
-        }
-
-
     }
 
-    /**
-     * Checks if this is the daisy version
-     */
     ngOnInit() {
         this.getStoriesObservable = this.storyService.getStoriesEvent.subscribe(stories => {
             this.stories = stories.filter(s => s != null);
@@ -337,23 +322,24 @@ export class StoriesBarComponent implements OnInit, OnDestroy {
     mergeById(groups, stories) {
         const myMap = new Map;
         for (const story of stories) {
-            myMap.set(story._id, story.title);
+            myMap.set(story._id, story);
         }
 
-        const ret = [];
+        const groupStories = [];
         for (const group of groups) {
-            const gr = group;
+            const tmpGroup = group;
             for (const index in group.member_stories) {
                 if (!group.member_stories[index].title) {
-                    gr.member_stories[index] = {
-                        'title': myMap.get(group.member_stories[index]),
-                        '_id': group.member_stories[index]
+                    tmpGroup.member_stories[index] = {
+                        '_id': group.member_stories[index],
+                        'title': myMap.get(group.member_stories[index]).title,
+                        'issue_number': myMap.get(group.member_stories[index]).issue_number
                     };
                 }
             }
-            ret.push(gr);
+            groupStories.push(tmpGroup);
         }
-        return ret;
+        return groupStories;
     }
 
     /**
diff --git a/frontend/src/app/story-editor/story-editor.component.html b/frontend/src/app/story-editor/story-editor.component.html
index f7f37186a..2e8c445bf 100644
--- a/frontend/src/app/story-editor/story-editor.component.html
+++ b/frontend/src/app/story-editor/story-editor.component.html
@@ -43,7 +43,7 @@ <h1 class="LargeHeadline2">You are not authorized to use this project</h1>
   <div [class.darkTheme]="isDark" class="uk-card uk-card-default padding" id="story" cdkScrollable>
     <div class="storyHeaderContainer">
       <div>
-        <span id="storyHeader" class="SmallCategory1">Story</span>
+        <span id="storyHeader" class="SmallCategory1">Story&nbsp;</span>
         <dfn class="def">
           <span class="infoIcon uk-icon" uk-icon="info"></span>
           <span rel="def" style="left: 20px; position: absolute;">A user story describes requirements for a software
@@ -163,7 +163,7 @@ <h1 class="LargeHeadline2">You are not authorized to use this project</h1>
         <mat-expansion-panel-header class="scenarioHeaderContainer">
           <mat-panel-title>
             <div class="Smallnavigation1">
-              {{ 'background (Optional)' | titlecase }}
+              {{ 'Background (Optional)' | titlecase }}
               <span class="childElement infoIcon uk-icon" uk-icon="info" matTooltip="You can use the background to set actions, which will be carried out before testing the whole story.
               This happens before the test runs through the Given/When/Then-Steps and is used across all scenarios.
               In short: A background allows to set Given-Steps used for all scenarios."></span>
@@ -238,7 +238,7 @@ <h1 class="LargeHeadline2">You are not authorized to use this project</h1>
           File Manager
           </button>
           <div class="storyInOneSessionDiv">
-            <label class="selectLabel SmallIcontext">Run Story in one Session:</label>
+            <label class="selectLabel SmallIcontext">Single Session:</label>
             <input type="checkbox" id="oneDriverCheck" (change)="setOneDriver()" [checked]="this.selectedStory.oneDriver">
             <dfn class="def"><span id="oneDriverInfoIcon" uk-icon="info"></span>
               <span rel="def" style="font-weight: normal;">
@@ -351,7 +351,7 @@ <h1 class="LargeHeadline2">You are not authorized to use this project</h1>
       </div>
 
       <!--Scenario Editor-->
-      <app-scenario-editor [isDark]="isDark" #scenarioChild (diasyLoginChanged)="setShowDaisy($event)"
+      <app-scenario-editor [isDark]="isDark" #scenarioChild
         (selectNewScenarioEvent)="selectNewScenario($event);" (addScenarioEvent)="addScenario($event);"
         (deleteScenarioEvent)="showDeleteScenarioToast($event);" [originalStepTypes]="originalStepTypes"
         [testRunning]="testRunning" [newlySelectedStory]="selectedStory"
diff --git a/frontend/src/app/story-editor/story-editor.component.ts b/frontend/src/app/story-editor/story-editor.component.ts
index 22a1168b0..668497599 100644
--- a/frontend/src/app/story-editor/story-editor.component.ts
+++ b/frontend/src/app/story-editor/story-editor.component.ts
@@ -231,11 +231,6 @@ export class StoryEditorComponent implements OnInit, OnDestroy {
    */
   saveBackgroundAndRun = false;
 
-  /**
-   * if the daisy version is currently used
-   */
-  daisyVersion = false;
-
   /**
    * if the report is saved
    */
@@ -301,8 +296,6 @@ export class StoryEditorComponent implements OnInit, OnDestroy {
 
   lastToFocus;
 
-  showDaisy = false;
-
   /**
    * Mapping for Precondition Stories
    */
@@ -388,11 +381,6 @@ export class StoryEditorComponent implements OnInit, OnDestroy {
       this.storiesError = false;
     }
     const version = localStorage.getItem("version");
-    if (version === "DAISY" || !version) {
-      this.daisyVersion = true;
-    } else {
-      this.daisyVersion = false;
-    }
 
     this.gecko_enabled = localStorage.getItem("gecko_enabled");
     this.chromium_enabled = localStorage.getItem("chromium_enabled");
@@ -1601,10 +1589,6 @@ export class StoryEditorComponent implements OnInit, OnDestroy {
     );
   }
 
-  setShowDaisy(event) {
-    this.showDaisy = event;
-  }
-
   toTicket(issue_number: string) {
     const host = this.selectedStory.host
     const url = `https://${host}/browse/${issue_number}`;
diff --git a/frontend/src/assets/icon-quad.png b/frontend/src/assets/icon-quad.png
new file mode 100644
index 000000000..fefa7c9e5
Binary files /dev/null and b/frontend/src/assets/icon-quad.png differ
diff --git a/frontend/src/assets/icon-removebg.png b/frontend/src/assets/icon-removebg.png
new file mode 100644
index 000000000..6c04d3f0e
Binary files /dev/null and b/frontend/src/assets/icon-removebg.png differ
diff --git a/frontend/src/assets/jira-icon.png b/frontend/src/assets/jira-icon.png
new file mode 100644
index 000000000..2486cc2a9
Binary files /dev/null and b/frontend/src/assets/jira-icon.png differ
diff --git a/frontend/src/assets/jira-logo-gradient-blue@2x-300x177.png b/frontend/src/assets/jira-logo-gradient-blue@2x-300x177.png
deleted file mode 100644
index 6b28ea200..000000000
Binary files a/frontend/src/assets/jira-logo-gradient-blue@2x-300x177.png and /dev/null differ
diff --git a/frontend/src/assets/logos--xray-for-jira.svg b/frontend/src/assets/logos--xray-for-jira.svg
new file mode 100644
index 000000000..cc7498a67
--- /dev/null
+++ b/frontend/src/assets/logos--xray-for-jira.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="209" viewBox="0 0 512 209"><path fill="#31b34b" d="m98.092 104.307l-49.011 12.252l-24.54 91.807z" opacity="0.5"/><path fill="#31b34b" d="M98.092 104.307L0 129.024V67.443h73.551l24.718 36.828z" opacity="0.8"/><path fill="#31b34b" d="M0 67.443v61.44L73.551 0z"/><path d="m153.07 55.049l22.528 32.273l22.528-32.273h22.246l-32.803 46.998l35.84 51.27h-22.67l-25.035-35.098l-24.717 35.099h-22.104l35.31-50.388l-33.05-47.881zm145.832 98.269l-16.914-28.955q-1.766.105-3.53 0h-21.964v28.955H237.64v-98.27h40.818c25.318 0 39.76 12.183 39.76 33.828c0 15.466-6.85 26.518-19.456 31.78l21.54 32.662zm-42.372-45.586h22.069c14.124 0 21.821-6.003 21.821-18.362s-7.838-17.972-21.821-17.972h-22.105v36.37zm148.939 24.717h-47.952l-8.686 20.869h-19.385l43.078-98.27h19.42l42.444 98.27h-20.162zm-6.71-16.172l-17.09-41.454l-17.655 41.348zm77.683 4.66v32.38h-18.75v-31.461l-36.58-66.807h19.031l26.695 46.186l26.306-46.186H512z"/></svg>
\ No newline at end of file
diff --git a/frontend/src/assets/seed-test-logo_transparent.png b/frontend/src/assets/seed-test-logo_transparent.png
new file mode 100644
index 000000000..f1d6d134d
Binary files /dev/null and b/frontend/src/assets/seed-test-logo_transparent.png differ
diff --git a/frontend/src/assets/xray-icon.png b/frontend/src/assets/xray-icon.png
new file mode 100644
index 000000000..f939a5512
Binary files /dev/null and b/frontend/src/assets/xray-icon.png differ
diff --git a/frontend/src/assets/xray.webp b/frontend/src/assets/xray.webp
new file mode 100644
index 000000000..ddd1faf0f
Binary files /dev/null and b/frontend/src/assets/xray.webp differ