diff --git a/.github/file-filters.yml b/.github/file-filters.yml
new file mode 100644
index 000000000..2ae1bf9b4
--- /dev/null
+++ b/.github/file-filters.yml
@@ -0,0 +1,43 @@
+# These file filter patterns are used by the action https://github.com/dorny/paths-filter
+
+# more differentiated filters for admin interface, which might be used later
+# admin_locales: &admin_locales
+#   - 'admin/src/locales/**'
+#   - 'admin/scripts/sort*'
+
+# admin_stylelinting: &admin_stylelinting
+#   - 'admin/{components,layouts,pages}/**/*.{scss,vue}'
+#   - 'admin/.stylelintrc.js'
+
+# admin_linting: &admin_linting
+#   - 'admin/.eslint*'
+#   - 'admin/babel.config.js'
+#   - 'admin/package.json'
+#   - 'admin/**/*.{js,vue}'
+#   - *admin_locales
+
+# admin_unit_testing: &admin_unit_testing
+#   - 'admin/package.json'
+#   - 'admin/{jest,vue}.config.js'
+#   - 'admin/{public,run,test}/**/*'
+#   - 'admin/src/!(locales)/**/*'
+
+# admin_docker_building: &admin_docker_building
+#   - 'admin/.dockerignore'
+#   - 'admin/Dockerfile'
+#   - *admin_unit_testing
+
+admin: &admin
+  - 'admin/**/*'
+
+dht_node: &dht_node
+  - 'dht-node/**/*'
+
+docker: &docker
+  - 'docker-compose.*'
+
+federation: &federation
+  - 'federation/**/*'
+
+frontend: &frontend
+  - 'frontend/**/*'
\ No newline at end of file
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
new file mode 100644
index 000000000..d1dd2851a
--- /dev/null
+++ b/.github/workflows/e2e-test.yml
@@ -0,0 +1,58 @@
+name: Gradido End-to-End Test CI
+
+on: push
+
+jobs:
+  end-to-end-tests:
+    name: End-to-End Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Boot up test system | docker-compose mariadb
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
+
+      - name: Boot up test system | docker-compose database
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
+
+      - name: Boot up test system | docker-compose backend
+        run: |
+          cd backend
+          cp .env.test_e2e .env
+          cd ..
+          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend 
+
+      - name: Sleep for 10 seconds
+        run: sleep 10s
+
+      - name: Boot up test system | seed backend
+        run: |
+          sudo chown runner:docker -R *
+          cd database
+          yarn && yarn dev_reset
+          cd ../backend
+          yarn && yarn seed
+          cd ..
+
+      - name: Boot up test system | docker-compose frontends
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx
+
+      - name: Boot up test system | docker-compose mailserver
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver
+
+      - name: Sleep for 15 seconds
+        run: sleep 15s
+
+      - name: End-to-end tests | run tests
+        id: e2e-tests
+        run: |
+          cd e2e-tests/
+          yarn
+          yarn run cypress run
+      - name: End-to-end tests | if tests failed, upload screenshots
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-screenshots
+          path: /home/runner/work/gradido/gradido/e2e-tests/cypress/screenshots/
diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml
new file mode 100644
index 000000000..a163af4e9
--- /dev/null
+++ b/.github/workflows/test-admin-interface.yml
@@ -0,0 +1,84 @@
+name: Gradido Admin Interface Test CI
+
+on: push
+
+jobs:
+  # only (but most important) job from this workflow required for pull requests
+  # check results serve as run conditions for all other jobs here 
+  files-changed:
+    name: Detect File Changes - Admin Interface
+    runs-on: ubuntu-latest
+    outputs:
+      admin: ${{ steps.changes.outputs.admin }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for admin interface file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
+  
+  build_test:
+    if: needs.files-changed.outputs.admin == 'true'
+    name: Docker Build Test - Admin Interface
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Admin Interface | Build 'test' image
+        run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test"
+
+  unit_test:
+    if: needs.files-changed.outputs.admin == 'true'
+    name: Unit Tests - Admin Interface
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Admin Interface | Unit tests
+        run: cd admin && yarn && yarn run test
+
+  lint:
+    if: needs.files-changed.outputs.admin == 'true'
+    name: Lint - Admin Interface
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Admin Interface | Lint
+        run: cd admin && yarn && yarn run lint
+
+  stylelint:
+    if: needs.files-changed.outputs.admin == 'true'
+    name: Stylelint - Admin Interface
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Admin Interface | Stylelint
+        run: cd admin && yarn && yarn run stylelint
+
+  locales:
+    if: needs.files-changed.outputs.admin == 'true'
+    name: Locales - Admin Interface
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Admin Interface | Locales
+        run: cd admin && yarn && yarn run locales
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index badb47e87..1e5f0db02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,57 +3,6 @@ name: gradido test CI
 on: push
 
 jobs:
-  ##############################################################################
-  # JOB: DOCKER BUILD TEST FRONTEND ############################################
-  ##############################################################################
-  build_test_frontend:
-    name: Docker Build Test - Frontend
-    runs-on: ubuntu-latest
-    #needs: [nothing]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # FRONTEND ###############################################################
-      ##########################################################################
-      - name: Frontend | Build `test` image
-        run: |
-          docker build --target test -t "gradido/frontend:test" frontend/
-          docker save "gradido/frontend:test" > /tmp/frontend.tar
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: docker-frontend-test
-          path: /tmp/frontend.tar
-
-  ##############################################################################
-  # JOB: DOCKER BUILD TEST ADMIN INTERFACE #####################################
-  ##############################################################################
-  build_test_admin:
-    name: Docker Build Test - Admin Interface
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # ADMIN INTERFACE ########################################################
-      ##########################################################################
-      - name: Admin | Build `test` image
-        run: |
-          docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test"
-          docker save "gradido/admin:test" > /tmp/admin.tar
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: docker-admin-test
-          path: /tmp/admin.tar
-
   ##############################################################################
   # JOB: DOCKER BUILD TEST BACKEND #############################################
   ##############################################################################
@@ -157,114 +106,6 @@ jobs:
           name: docker-nginx-test
           path: /tmp/nginx.tar
 
-  ##############################################################################
-  # JOB: LOCALES FRONTEND ######################################################
-  ##############################################################################
-  locales_frontend:
-    name: Locales - Frontend
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # LOCALES FRONTEND #######################################################
-      ##########################################################################
-      - name: Frontend | Locales
-        run: cd frontend && yarn && yarn run locales
-
-  ##############################################################################
-  # JOB: LINT FRONTEND #########################################################
-  ##############################################################################
-  lint_frontend:
-    name: Lint - Frontend
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # LINT FRONTEND ##########################################################
-      ##########################################################################
-      - name: Frontend | Lint
-        run: cd frontend && yarn && yarn run lint
-
-  ##############################################################################
-  # JOB: STYLELINT FRONTEND ####################################################
-  ##############################################################################
-  stylelint_frontend:
-    name: Stylelint - Frontend
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # STYLELINT FRONTEND #####################################################
-      ##########################################################################
-      - name: Frontend | Stylelint
-        run: cd frontend && yarn && yarn run stylelint
-
-  ##############################################################################
-  # JOB: LINT ADMIN INTERFACE ##################################################
-  ##############################################################################
-  lint_admin:
-    name: Lint - Admin Interface
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # LINT ADMIN INTERFACE ###################################################
-      ##########################################################################
-      - name: Admin Interface | Lint
-        run: cd admin && yarn && yarn run lint
-
-  ##############################################################################
-  # JOB: STYLELINT ADMIN INTERFACE #############################################
-  ##############################################################################
-  stylelint_admin:
-    name: Stylelint - Admin Interface
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # STYLELINT ADMIN INTERFACE ##############################################
-      ##########################################################################
-      - name: Admin Interface | Stylelint
-        run: cd admin && yarn && yarn run stylelint
-
-  ##############################################################################
-  # JOB: LOCALES ADMIN #########################################################
-  ##############################################################################
-  locales_admin:
-    name: Locales - Admin Interface
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # LOCALES FRONTEND #######################################################
-      ##########################################################################
-      - name: Admin | Locales
-        run: cd admin && yarn && yarn run locales
-
   ##############################################################################
   # JOB: LINT BACKEND ##########################################################
   ##############################################################################
@@ -281,7 +122,7 @@ jobs:
       # LINT BACKEND ###########################################################
       ##########################################################################
       - name: backend | Lint
-        run: cd backend && yarn && yarn run lint
+        run: cd database && yarn && cd ../backend && yarn && yarn run lint
 
   ##############################################################################
   # JOB: LOCALES BACKEND #######################################################
@@ -319,68 +160,6 @@ jobs:
       - name: Database | Lint
         run: cd database && yarn && yarn run lint
 
-  ##############################################################################
-  # JOB: UNIT TEST FRONTEND  ###################################################
-  ##############################################################################
-  unit_test_frontend:
-    name: Unit tests - Frontend
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # UNIT TESTS FRONTEND ####################################################
-      ##########################################################################
-      - name: Frontend | Unit tests
-        run: |
-          cd frontend && yarn && yarn run test
-          cp -r ./coverage ../
-      ##########################################################################
-      # COVERAGE CHECK FRONTEND ################################################
-      ##########################################################################
-      - name: frontend | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Frontend
-          type: lcov
-          result_path: ./frontend/coverage/lcov.info
-          min_coverage: 95
-          token: ${{ github.token }}
-  
-  ##############################################################################
-  # JOB: UNIT TEST ADMIN INTERFACE #############################################
-  ##############################################################################
-  unit_test_admin:
-    name: Unit tests - Admin Interface
-    runs-on: ubuntu-latest
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # UNIT TESTS ADMIN INTERFACE #############################################
-      ##########################################################################
-      - name: Admin Interface | Unit tests
-        run: |
-          cd admin && yarn && yarn run test
-          cp -r ./coverage ../
-      ##########################################################################
-      # COVERAGE CHECK ADMIN INTERFACE #########################################
-      ##########################################################################
-      - name: Admin Interface | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Admin Interface
-          type: lcov
-          result_path: ./admin/coverage/lcov.info
-          min_coverage: 97
-          token: ${{ github.token }}
-
   ##############################################################################
   # JOB: UNIT TEST BACKEND  ####################################################
   ##############################################################################
@@ -415,20 +194,7 @@ jobs:
       - name: backend | docker-compose database
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
       - name: backend Unit tests | test
-        run: |
-          cd database && yarn && yarn build && cd ../backend && yarn && yarn test
-          cp -r ./coverage ../
-      ##########################################################################
-      # COVERAGE CHECK BACKEND #################################################
-      ##########################################################################
-      - name: backend | Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage Backend
-          type: lcov
-          result_path: ./backend/coverage/lcov.info
-          min_coverage: 80
-          token: ${{ github.token }}
+        run: cd database && yarn && yarn build && cd ../backend && yarn && yarn test
 
   ##########################################################################
   # DATABASE MIGRATION TEST UP + RESET #####################################
@@ -452,108 +218,3 @@ jobs:
         run: docker-compose -f docker-compose.yml run -T database yarn up
       - name: database | reset
         run: docker-compose -f docker-compose.yml run -T database yarn reset
-
-  ##############################################################################
-  # JOB: END-TO-END TESTS  #####################################################
-  ##############################################################################
-  end-to-end-tests:
-    name: End-to-End Tests
-    runs-on: ubuntu-latest
-    needs: [build_test_mariadb, build_test_database_up, build_test_admin, build_test_frontend, build_test_nginx]
-    steps:
-      ##########################################################################
-      # CHECKOUT CODE ##########################################################
-      ##########################################################################
-      - name: Checkout code
-        uses: actions/checkout@v3
-      ##########################################################################
-      # DOWNLOAD DOCKER IMAGES #################################################
-      ##########################################################################
-      - name: Download Docker Image (Mariadb)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-mariadb-test
-          path: /tmp
-      - name: Load Docker Image (Mariadb)
-        run: docker load < /tmp/mariadb.tar
-      - name: Download Docker Image (Database Up)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-database-test_up
-          path: /tmp
-      - name: Load Docker Image (Database Up)
-        run: docker load < /tmp/database_up.tar
-      - name: Download Docker Image (Frontend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-frontend-test
-          path: /tmp
-      - name: Load Docker Image (Frontend)
-        run: docker load < /tmp/frontend.tar
-      - name: Download Docker Image (Admin Interface)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-admin-test
-          path: /tmp
-      - name: Load Docker Image (Admin Interface)
-        run: docker load < /tmp/admin.tar
-      - name: Download Docker Image (Nginx)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-nginx-test
-          path: /tmp
-      - name: Load Docker Image (Nginx)
-        run: docker load < /tmp/nginx.tar
-
-      ##########################################################################
-      # BOOT UP THE TEST SYSTEM ################################################
-      ##########################################################################
-      - name: Boot up test system | docker-compose mariadb
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb
-
-      - name: Boot up test system | docker-compose database
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
-
-      - name: Boot up test system | docker-compose backend
-        run: |
-          cd backend
-          cp .env.test_e2e .env
-          cd ..
-          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend 
-
-      - name: Sleep for 10 seconds
-        run: sleep 10s
-
-      - name: Boot up test system | seed backend
-        run: |
-          sudo chown runner:docker -R *
-          cd database
-          yarn && yarn dev_reset
-          cd ../backend
-          yarn && yarn seed
-          cd ..
-
-      - name: Boot up test system | docker-compose frontends
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx
-
-      - name: Boot up test system | docker-compose mailserver
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver
-
-      - name: Sleep for 15 seconds
-        run: sleep 15s
-
-      ##########################################################################
-      # END-TO-END TESTS #######################################################
-      ##########################################################################
-      - name: End-to-end tests | run tests
-        id: e2e-tests
-        run: |
-          cd e2e-tests/
-          yarn
-          yarn run cypress run --spec cypress/e2e/User.Authentication.feature,cypress/e2e/User.Authentication.ResetPassword.feature
-      - name: End-to-end tests | if tests failed, upload screenshots
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-screenshots
-          path: /home/runner/work/gradido/gradido/e2e-tests/cypress/screenshots/
diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht-node.yml
index 5b3a65a70..a57f09399 100644
--- a/.github/workflows/test_dht-node.yml
+++ b/.github/workflows/test_dht-node.yml
@@ -1,19 +1,40 @@
-name: gradido test_dht-node CI
+name: Gradido DHT Node Test CI
 
 on: push
 
 jobs:
+  # only (but most important) job from this workflow required for pull requests
+  # check results serve as run conditions for all other jobs here 
+  files-changed:
+    name: Detect File Changes - DHT Node
+    runs-on: ubuntu-latest
+    outputs:
+      dht_node: ${{ steps.changes.outputs.dht_node }}
+      docker: ${{ steps.changes.outputs.docker }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
   ##############################################################################
   # JOB: DOCKER BUILD TEST #####################################################
   ##############################################################################
   build:
-    name: Docker Build Test
+    name: Docker Build Test - DHT Node
+    if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
       
-      - name: Build `test` image
+      - name: Build 'test' image
         run: |
           docker build --target test -t "gradido/dht-node:test" -f dht-node/Dockerfile .
           docker save "gradido/dht-node:test" > /tmp/dht-node.tar
@@ -28,31 +49,25 @@ jobs:
   # JOB: LINT ##################################################################
   ##############################################################################
   lint:
-    name: Lint
+    name: Lint - DHT Node
+    if: needs.files-changed.outputs.dht_node == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
-    needs: [build]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-dht-node-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/dht-node.tar
       
       - name: Lint
-        run: docker run --rm gradido/dht-node:test yarn run lint
+        run: cd dht-node && yarn && yarn run lint
 
   ##############################################################################
   # JOB: UNIT TEST #############################################################
   ##############################################################################
   unit_test:
-    name: Unit tests
+    name: Unit Tests - DHT Node
+    if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true'
+    needs: [files-changed, build]
     runs-on: ubuntu-latest
-    needs: [build]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -83,16 +98,4 @@ jobs:
       #- name: Unit tests
       #  run: cd database && yarn && yarn build && cd ../dht-node && yarn && yarn test
       - name: Unit tests
-        run: |
-          docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/dht-node:test yarn run test
-          cp -r ~/coverage ./coverage
-          
-      - name: Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage dht-node
-          type: lcov
-          #result_path: ./dht-node/coverage/lcov.info
-          result_path: ./coverage/lcov.info
-          min_coverage: 79
-          token: ${{ github.token }}
+        run: docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net --rm gradido/dht-node:test yarn run test
diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml
index 2da78758e..fc29a1bf8 100644
--- a/.github/workflows/test_federation.yml
+++ b/.github/workflows/test_federation.yml
@@ -1,13 +1,34 @@
-name: gradido test_federation CI
+name: Gradido Federation Test CI
 
 on: push
 
 jobs:
+  # only (but most important) job from this workflow required for pull requests
+  # check results serve as run conditions for all other jobs here 
+  files-changed:
+    name: Detect File Changes - Federation
+    runs-on: ubuntu-latest
+    outputs:
+      docker: ${{ steps.changes.outputs.docker }}
+      federation: ${{ steps.changes.outputs.federation }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+  
   ##############################################################################
   # JOB: DOCKER BUILD TEST #####################################################
   ##############################################################################
   build:
-    name: Docker Build Test
+    name: Docker Build Test - Federation
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -28,31 +49,25 @@ jobs:
   # JOB: LINT ##################################################################
   ##############################################################################
   lint:
-    name: Lint
+    name: Lint - Federation
+    if: needs.files-changed.outputs.federation == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
-    needs: [build]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-federation-test
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/federation.tar
       
       - name: Lint
-        run: docker run --rm gradido/federation:test yarn run lint
+        run: cd federation && yarn && yarn run lint
 
   ##############################################################################
   # JOB: UNIT TEST #############################################################
   ##############################################################################
   unit_test:
-    name: Unit tests
+    name: Unit Tests - Federation
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true'
+    needs: [files-changed, build]
     runs-on: ubuntu-latest
-    needs: [build]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -84,15 +99,4 @@ jobs:
       #  run: cd database && yarn && yarn build && cd ../dht-node && yarn && yarn test
       - name: Unit tests
         run: |
-          docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net -v ~/coverage:/app/coverage --rm gradido/federation:test yarn run test
-          cp -r ~/coverage ./coverage
-          
-      - name: Coverage check
-        uses: webcraftmedia/coverage-check-action@master
-        with:
-          report_name: Coverage federation
-          type: lcov
-          #result_path: ./federation/coverage/lcov.info
-          result_path: ./coverage/lcov.info
-          min_coverage: 72
-          token: ${{ github.token }}
+          docker run --env NODE_ENV=test --env DB_HOST=mariadb --network gradido_internal-net --rm gradido/federation:test yarn run test
diff --git a/.github/workflows/test_frontend.yml b/.github/workflows/test_frontend.yml
new file mode 100644
index 000000000..6dd527079
--- /dev/null
+++ b/.github/workflows/test_frontend.yml
@@ -0,0 +1,84 @@
+name: Gradido Frontend Test CI
+
+on: push
+
+jobs:
+  # only (but most important) job from this workflow required for pull requests
+  # check results serve as run conditions for all other jobs here 
+  files-changed:
+    name: Detect File Changes - Frontend
+    runs-on: ubuntu-latest
+    outputs:
+      frontend: ${{ steps.changes.outputs.frontend }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
+
+  
+  build_test:
+    if: needs.files-changed.outputs.frontend == 'true'
+    name: Docker Build Test - Frontend
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Frontend | Build 'test' image
+        run: docker build --target test -t "gradido/frontend:test" frontend/ --build-arg NODE_ENV="test"
+
+  unit_test:
+    if: needs.files-changed.outputs.frontend == 'true'
+    name: Unit Tests - Frontend
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Frontend | Unit tests
+        run: cd frontend && yarn && yarn run test
+
+  lint:
+    if: needs.files-changed.outputs.frontend == 'true'
+    name: Lint - Frontend
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Frontend | Lint
+        run: cd frontend && yarn && yarn run lint
+
+  stylelint:
+    if: needs.files-changed.outputs.frontend == 'true'
+    name: Stylelint - Frontend
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Frontend | Stylelint
+        run: cd frontend && yarn && yarn run stylelint
+
+  locales:
+    if: needs.files-changed.outputs.frontend == 'true'
+    name: Locales - Frontend
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Frontend | Locales
+        run: cd frontend && yarn && yarn run locales
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bfc66e39..8dc91f2fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,76 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.19.1](https://github.com/gradido/gradido/compare/1.19.0...1.19.1)
+
+- fix(frontend): admin question clickable [`#2810`](https://github.com/gradido/gradido/pull/2810)
+- refactor(frontend): change b-img to b-icon send [`#2809`](https://github.com/gradido/gradido/pull/2809)
+- fix(admin): update openCreation in case of tab open. [`#2806`](https://github.com/gradido/gradido/pull/2806)
+- fix(admin): english language for contributions in admin [`#2804`](https://github.com/gradido/gradido/pull/2804)
+- refactor(admin): event buttons for myself turned off in open contributions [`#2760`](https://github.com/gradido/gradido/pull/2760)
+- fix(admin): contribution page [`#2794`](https://github.com/gradido/gradido/pull/2794)
+- fix(frontend): info.svg [`#2798`](https://github.com/gradido/gradido/pull/2798)
+- fix(backend): add relation messages to database query [`#2795`](https://github.com/gradido/gradido/pull/2795)
+- fix(admin): header and menu [`#2793`](https://github.com/gradido/gradido/pull/2793)
+- fix(frontend): send gdd - change first submit button text to 'Check Now' [`#2774`](https://github.com/gradido/gradido/pull/2774)
+- refactor(frontend): creations generated by link NL [`#2771`](https://github.com/gradido/gradido/pull/2771)
+- refactor(frontend): creations generated by link (FR) + (NL) [`#2770`](https://github.com/gradido/gradido/pull/2770)
+- refactor(frontend): update German locales [`#2765`](https://github.com/gradido/gradido/pull/2765)
+- refactor(backend): use find contributions helper for list contributions [`#2762`](https://github.com/gradido/gradido/pull/2762)
+
+#### [1.19.0](https://github.com/gradido/gradido/compare/1.18.2...1.19.0)
+
+> 7 March 2023
+
+- chore(release): version 1.19.0 [`#2786`](https://github.com/gradido/gradido/pull/2786)
+- fix(frontend): change contribution design [`#2731`](https://github.com/gradido/gradido/pull/2731)
+- refactor(frontend): commnity navbar- & unauthenticated b-gradido styles [`#2732`](https://github.com/gradido/gradido/pull/2732)
+- fix(database): change downwards migration to delete entries with last_announced_at IS NULL [`#2767`](https://github.com/gradido/gradido/pull/2767)
+- feat(admin): deleted contributions visible [`#2759`](https://github.com/gradido/gradido/pull/2759)
+- feat(other): e2e test user story user registration [`#2753`](https://github.com/gradido/gradido/pull/2753)
+- refactor(frontend): style and design changes to a contribution [`#2648`](https://github.com/gradido/gradido/pull/2648)
+- test(backend): add tests that ``sendContributionDeleted`` and ``sendContributionDenied`` are called [`#2740`](https://github.com/gradido/gradido/pull/2740)
+- fix(backend): set email tls true in test [`#2763`](https://github.com/gradido/gradido/pull/2763)
+- refactor(frontend): add visible event an answer question [`#2750`](https://github.com/gradido/gradido/pull/2750)
+- refactor(frontend): style sidebar, add icons [`#2737`](https://github.com/gradido/gradido/pull/2737)
+- fix(backend): possible flaky test [`#2761`](https://github.com/gradido/gradido/pull/2761)
+- fix(backend): emails – adjust namings of menus to new design [`#2756`](https://github.com/gradido/gradido/pull/2756)
+- ci(other): rename dht node and federation workflow jobs for better branch protection maintenance [`#2743`](https://github.com/gradido/gradido/pull/2743)
+- refactor(backend): combine logic for `listTransactionLinks` & `listTransactionLinksAdmin` [`#2706`](https://github.com/gradido/gradido/pull/2706)
+- refactor(backend): remove admin create contributions [`#2724`](https://github.com/gradido/gradido/pull/2724)
+- refactor(frontend): remove .vue as imports [`#2725`](https://github.com/gradido/gradido/pull/2725)
+- feat(federation): add dht-node to deployment scripts [`#2729`](https://github.com/gradido/gradido/pull/2729)
+- fix(frontend): change fetchPolicy, add scripts.update [`#2718`](https://github.com/gradido/gradido/pull/2718)
+- refactor(backend): list unconfirmed contribution to admin list all contribution [`#2666`](https://github.com/gradido/gradido/pull/2666)
+- refactor(frontend): community routes [`#2721`](https://github.com/gradido/gradido/pull/2721)
+- test(backend): authentication tests for TransactionLinkResolver [`#2705`](https://github.com/gradido/gradido/pull/2705)
+- refactor(backend): use LogError on errors [`#2679`](https://github.com/gradido/gradido/pull/2679)
+- refactor(backend): use LogError on encryptorUtils [`#2678`](https://github.com/gradido/gradido/pull/2678)
+- refactor(backend): use LogError on creations [`#2677`](https://github.com/gradido/gradido/pull/2677)
+- refactor(other): decrease docker build dependencies in test workflow [`#2719`](https://github.com/gradido/gradido/pull/2719)
+- refactor(backend): unit test for the method denyContribution [`#2639`](https://github.com/gradido/gradido/pull/2639)
+- refactor(frontend): logo inserted with better quality. [`#2646`](https://github.com/gradido/gradido/pull/2646)
+- feat(federation): harmonize and sync modules and data of federation [`#2665`](https://github.com/gradido/gradido/pull/2665)
+- feat(federation): add docker and github-workflow files [`#2680`](https://github.com/gradido/gradido/pull/2680)
+- feat(other): e2e test user authentication reset password [`#2644`](https://github.com/gradido/gradido/pull/2644)
+- refactor(admin): add tabs for all statusus on contributions [`#2623`](https://github.com/gradido/gradido/pull/2623)
+- feat(federation): implement a graphql client to request getpublickey [`#2511`](https://github.com/gradido/gradido/pull/2511)
+- refactor(frontend): style refactor mobil auth area [`#2643`](https://github.com/gradido/gradido/pull/2643)
+- refactor(backend): use LogError on TransactionResolver [`#2676`](https://github.com/gradido/gradido/pull/2676)
+- refactor(backend): event protocol rework [`#2691`](https://github.com/gradido/gradido/pull/2691)
+- refactor(backend): use LogError on TransactionLinkResolver [`#2673`](https://github.com/gradido/gradido/pull/2673)
+- fix(frontend): simple disabled function on submit send [`#2647`](https://github.com/gradido/gradido/pull/2647)
+- refactor(frontend): missing message on old transactions [`#2660`](https://github.com/gradido/gradido/pull/2660)
+- refactor(admin): remove overview  and multi creation menu entry [`#2661`](https://github.com/gradido/gradido/pull/2661)
+- feat(other): add locales check to backend and integrate it to test workflow [`#2693`](https://github.com/gradido/gradido/pull/2693)
+- refactor(other): add linting rules like in backend modul [`#2695`](https://github.com/gradido/gradido/pull/2695)
+- refactor(backend): use LogError on contributionResolver [`#2669`](https://github.com/gradido/gradido/pull/2669)
+
 #### [1.18.2](https://github.com/gradido/gradido/compare/1.18.1...1.18.2)
 
+> 10 February 2023
+
+- chore(release): version 1.18.2 [`#2700`](https://github.com/gradido/gradido/pull/2700)
 - fix(admin): deny contribution button to left [`#2699`](https://github.com/gradido/gradido/pull/2699)
 
 #### [1.18.1](https://github.com/gradido/gradido/compare/1.18.0...1.18.1)
diff --git a/admin/jest.config.js b/admin/jest.config.js
index 9233dd2e7..b6ec1dc80 100644
--- a/admin/jest.config.js
+++ b/admin/jest.config.js
@@ -1,11 +1,17 @@
 module.exports = {
   verbose: true,
+  collectCoverage: true,
   collectCoverageFrom: [
     'src/**/*.{js,vue}',
     '!**/node_modules/**',
     '!src/assets/**',
     '!**/?(*.)+(spec|test).js?(x)',
   ],
+  coverageThreshold: {
+    global: {
+      lines: 97,
+    },
+  },
   moduleFileExtensions: [
     'js',
     // 'jsx',
diff --git a/admin/package.json b/admin/package.json
index 941a9bf69..3406c326a 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.18.2",
+  "version": "1.19.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
@@ -14,7 +14,7 @@
     "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
     "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
-    "test": "cross-env TZ=UTC jest --coverage",
+    "test": "cross-env TZ=UTC jest",
     "locales": "scripts/sort.sh"
   },
   "dependencies": {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 0092751cc..f0b6ea821 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -10,6 +10,7 @@ describe('ContributionMessagesList', () => {
 
   const propsData = {
     contributionId: 42,
+    contributionState: 'PENDING',
   }
 
   const mocks = {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 636627385..fab6b5e4a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,17 +1,18 @@
 <template>
   <div class="contribution-messages-list">
     <b-container>
-      {{ messages.lenght }}
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
 
-    <contribution-messages-formular
-      :contributionId="contributionId"
-      @get-list-contribution-messages="getListContributionMessages"
-      @update-state="updateState"
-    />
+    <div v-if="contributionState === 'PENDING' || contributionState === 'IN_PROGRESS'">
+      <contribution-messages-formular
+        :contributionId="contributionId"
+        @get-list-contribution-messages="getListContributionMessages"
+        @update-state="updateState"
+      />
+    </div>
   </div>
 </template>
 <script>
@@ -30,6 +31,10 @@ export default {
       type: Number,
       required: true,
     },
+    contributionState: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 7e2b7d76f..dae4bba91 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="component-nabvar">
-    <b-navbar toggleable="md" type="dark" variant="success" class="p-3">
-      <b-navbar-brand to="/">
-        <img src="img/brand/gradido_logo_w.png" class="navbar-brand-img" alt="..." />
+    <b-navbar toggleable="md" type="dark" variant="success">
+      <b-navbar-brand class="mb-2" to="/">
+        <img src="img/brand/gradido_logo_w.png" class="navbar-brand-img pl-2" alt="..." />
       </b-navbar-brand>
 
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
@@ -10,7 +10,7 @@
       <b-collapse id="nav-collapse" is-nav>
         <b-navbar-nav>
           <b-nav-item to="/user">{{ $t('navbar.user_search') }}</b-nav-item>
-          <b-nav-item class="bg-color-creation p-1" to="/creation-confirm">
+          <b-nav-item class="bg-color-creation" to="/creation-confirm">
             {{ $t('creation') }}
             <b-badge v-show="$store.state.openCreations > 0" variant="danger">
               {{ $store.state.openCreations }}
@@ -52,6 +52,5 @@ export default {
 <style>
 .navbar-brand-img {
   height: 2rem;
-  padding-left: 10px;
 }
 </style>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a4db8ac99..a17d3a185 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -13,17 +13,19 @@
         <b-icon :icon="getStatusIcon(row.item.state)"></b-icon>
       </template>
       <template #cell(bookmark)="row">
-        <b-button
-          variant="danger"
-          size="md"
-          @click="$emit('show-overlay', row.item, 'delete')"
-          class="mr-2"
-        >
-          <b-icon icon="trash" variant="light"></b-icon>
-        </b-button>
+        <div v-if="!myself(row.item)">
+          <b-button
+            variant="danger"
+            size="md"
+            @click="$emit('show-overlay', row.item, 'delete')"
+            class="mr-2"
+          >
+            <b-icon icon="trash" variant="light"></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #cell(editCreation)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
           <b-button
             v-if="row.item.moderator"
             variant="info"
@@ -36,30 +38,26 @@
           <b-button v-else @click="rowToggleDetails(row, 0)">
             <b-icon icon="chat-dots"></b-icon>
             <b-icon
-              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              v-if="row.item.state === 'PENDING' && row.item.messagesCount > 0"
               icon="exclamation-circle-fill"
               variant="warning"
             ></b-icon>
             <b-icon
-              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messagesCount > 0"
               icon="question-diamond"
-              variant="light"
+              variant="warning"
+              class="pl-1"
             ></b-icon>
           </b-button>
         </div>
       </template>
-      <template #cell(reActive)>
-        <b-button variant="warning" size="md" class="mr-2">
-          <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
-      </template>
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
         </b-button>
       </template>
       <template #cell(deny)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
           <b-button
             variant="warning"
             size="md"
@@ -71,7 +69,7 @@
         </div>
       </template>
       <template #cell(confirm)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
           <b-button
             variant="success"
             size="md"
@@ -104,6 +102,7 @@
             <div v-else>
               <contribution-messages-list
                 :contributionId="row.item.id"
+                :contributionState="row.item.state"
                 @update-state="updateState"
                 @update-user-data="updateUserData"
               />
@@ -158,13 +157,22 @@ export default {
     }
   },
   methods: {
+    myself(item) {
+      return (
+        `${item.firstName} ${item.lastName}` ===
+        `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
+      )
+    },
     getStatusIcon(status) {
       return iconMap[status] ? iconMap[status] : 'default-icon'
     },
     rowClass(item, type) {
       if (!item || type !== 'row') return
       if (item.state === 'CONFIRMED') return 'table-success'
-      if (item.state === 'DENIED') return 'table-info'
+      if (item.state === 'DENIED') return 'table-warning'
+      if (item.state === 'DELETED') return 'table-danger'
+      if (item.state === 'IN_PROGRESS') return 'table-primary'
+      if (item.state === 'PENDING') return 'table-primary'
     },
     updateCreationData(data) {
       const row = data.row
diff --git a/admin/src/components/TransactionLinkList.spec.js b/admin/src/components/TransactionLinkList.spec.js
index 3deaefa23..486b53859 100644
--- a/admin/src/components/TransactionLinkList.spec.js
+++ b/admin/src/components/TransactionLinkList.spec.js
@@ -9,8 +9,8 @@ const apolloQueryMock = jest.fn()
 apolloQueryMock.mockResolvedValue({
   data: {
     listTransactionLinksAdmin: {
-      linkCount: 8,
-      linkList: [
+      count: 8,
+      links: [
         {
           amount: '19.99',
           code: '62ef8236ace7217fbd066c5a',
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index 564865440..eb58903c6 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -42,8 +42,8 @@ export default {
           },
         })
         .then((result) => {
-          this.rows = result.data.listTransactionLinksAdmin.linkCount
-          this.items = result.data.listTransactionLinksAdmin.linkList
+          this.rows = result.data.listTransactionLinksAdmin.count
+          this.items = result.data.listTransactionLinksAdmin.links
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/graphql/adminCreateContributionMessage.js b/admin/src/graphql/adminCreateContributionMessage.js
index 25d81f151..747e6d7d4 100644
--- a/admin/src/graphql/adminCreateContributionMessage.js
+++ b/admin/src/graphql/adminCreateContributionMessage.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const adminCreateContributionMessage = gql`
-  mutation ($contributionId: Float!, $message: String!) {
+  mutation ($contributionId: Int!, $message: String!) {
     adminCreateContributionMessage(contributionId: $contributionId, message: $message) {
       id
       message
diff --git a/admin/src/graphql/listAllContributions.js b/admin/src/graphql/adminListAllContributions.js
similarity index 83%
rename from admin/src/graphql/listAllContributions.js
rename to admin/src/graphql/adminListAllContributions.js
index 655ab679c..cd47cd1d4 100644
--- a/admin/src/graphql/listAllContributions.js
+++ b/admin/src/graphql/adminListAllContributions.js
@@ -1,13 +1,13 @@
 import gql from 'graphql-tag'
 
-export const listAllContributions = gql`
+export const adminListAllContributions = gql`
   query (
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
     $statusFilter: [ContributionStatus!]
   ) {
-    listAllContributions(
+    adminListAllContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
@@ -28,6 +28,8 @@ export const listAllContributions = gql`
         messagesCount
         deniedAt
         deniedBy
+        deletedAt
+        deletedBy
       }
     }
   }
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index c3ffdb0b9..a311598e2 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const listContributionMessages = gql`
-  query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
+  query ($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
     listContributionMessages(
       contributionId: $contributionId
       pageSize: $pageSize
diff --git a/admin/src/graphql/listTransactionLinksAdmin.js b/admin/src/graphql/listTransactionLinksAdmin.js
index 2e4171f02..c069bafd9 100644
--- a/admin/src/graphql/listTransactionLinksAdmin.js
+++ b/admin/src/graphql/listTransactionLinksAdmin.js
@@ -8,8 +8,8 @@ export const listTransactionLinksAdmin = gql`
       userId: $userId
       filters: { withRedeemed: true, withExpired: true, withDeleted: true }
     ) {
-      linkCount
-      linkList {
+      count
+      links {
         id
         amount
         holdAvailableAmount
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 00eef1812..0d05eaa88 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -63,7 +63,6 @@
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
   "deny": "Ablehnen",
-  "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
   "expired": "abgelaufen",
@@ -101,7 +100,6 @@
   "message": {
     "request": "Die Anfrage wurde gesendet."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e318376b4..f36944a63 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -34,11 +34,11 @@
     "all": "All",
     "confirms": "Confirmed",
     "deleted": "Deleted",
-    "denied": "Denied",
+    "denied": "Rejected",
     "open": "Open"
   },
-  "created": "Confirmed",
-  "createdAt": "Created",
+  "created": "Created for",
+  "createdAt": "Created at",
   "creation": "Creation",
   "creationList": "Creation list",
   "creation_form": {
@@ -53,7 +53,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
-    "toasted_denied": "Open creation has been denied",
+    "toasted_denied": "Open creation has been rejected",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -63,7 +63,6 @@
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
   "deny": "Reject",
-  "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
   "expired": "expired",
@@ -87,7 +86,7 @@
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "periods": "For what period was it submitted by the member.",
-      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
       "submitted": "When was it submitted by the member"
     }
   },
@@ -101,7 +100,6 @@
   "message": {
     "request": "Request has been sent."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 710f2b26f..87f94e91f 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { denyContribution } from '../graphql/denyContribution'
-import { listAllContributions } from '../graphql/listAllContributions'
+import { adminListAllContributions } from '../graphql/adminListAllContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
 import VueApollo from 'vue-apollo'
@@ -38,7 +38,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    listAllContributions: {
+    adminListAllContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -92,14 +92,14 @@ const defaultData = () => {
 
 describe('CreationConfirm', () => {
   let wrapper
+  const adminListAllContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
   const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
-    listAllContributions,
-    jest
-      .fn()
+    adminListAllContributions,
+    adminListAllContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -331,78 +331,82 @@ describe('CreationConfirm', () => {
 
     describe('filter tabs', () => {
       describe('click tab "confirmed"', () => {
-        let refetchSpy
-
         beforeEach(async () => {
           jest.clearAllMocks()
-          refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
           await wrapper.find('a[data-test="confirmed"]').trigger('click')
         })
 
-        it('has statusFilter set to ["CONFIRMED"]', () => {
-          expect(
-            wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
-          ).toMatchObject({ statusFilter: ['CONFIRMED'] })
-        })
-
-        it('refetches contributions', () => {
-          expect(refetchSpy).toBeCalled()
+        it('refetches contributions with proper filter', () => {
+          expect(adminListAllContributionsMock).toBeCalledWith({
+            currentPage: 1,
+            order: 'DESC',
+            pageSize: 25,
+            statusFilter: ['CONFIRMED'],
+          })
         })
 
         describe('click tab "open"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
             await wrapper.find('a[data-test="open"]').trigger('click')
           })
 
-          it('has statusFilter set to ["IN_PROGRESS", "PENDING"]', () => {
-            expect(
-              wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
-            ).toMatchObject({ statusFilter: ['IN_PROGRESS', 'PENDING'] })
-          })
-
-          it('refetches contributions', () => {
-            expect(refetchSpy).toBeCalled()
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['IN_PROGRESS', 'PENDING'],
+            })
           })
         })
 
         describe('click tab "denied"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
             await wrapper.find('a[data-test="denied"]').trigger('click')
           })
 
-          it('has statusFilter set to ["DENIED"]', () => {
-            expect(
-              wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
-            ).toMatchObject({ statusFilter: ['DENIED'] })
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['DENIED'],
+            })
+          })
+        })
+
+        describe('click tab "deleted"', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper.find('a[data-test="deleted"]').trigger('click')
           })
 
-          it('refetches contributions', () => {
-            expect(refetchSpy).toBeCalled()
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['DELETED'],
+            })
           })
         })
 
         describe('click tab "all"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
             await wrapper.find('a[data-test="all"]').trigger('click')
           })
 
-          it('has statusFilter set to ["IN_PROGRESS", "PENDING", "CONFIRMED", "DENIED", "DELETED"]', () => {
-            expect(
-              wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
-            ).toMatchObject({
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
               statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
             })
           })
-
-          it('refetches contributions', () => {
-            expect(refetchSpy).toBeCalled()
-          })
         })
       })
     })
@@ -412,10 +416,20 @@ describe('CreationConfirm', () => {
         await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-state', 2)
       })
 
-      it.skip('updates the status', () => {
+      it('updates the status', () => {
         expect(wrapper.vm.items.find((obj) => obj.id === 2).messagesCount).toBe(1)
         expect(wrapper.vm.items.find((obj) => obj.id === 2).state).toBe('IN_PROGRESS')
       })
     })
+
+    describe('unknown variant', () => {
+      beforeEach(async () => {
+        await wrapper.setData({ variant: 'unknown' })
+      })
+
+      it('has overlay icon "info"', () => {
+        expect(wrapper.vm.overlayIcon).toBe('info')
+      })
+    })
   })
 })
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 7c354fc85..55caf8677 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -5,25 +5,37 @@
       <b-tabs v-model="tabIndex" content-class="mt-3" fill>
         <b-tab active :title-link-attributes="{ 'data-test': 'open' }">
           <template #title>
+            <b-icon icon="bell-fill" variant="primary"></b-icon>
             {{ $t('contributions.open') }}
             <b-badge v-if="$store.state.openCreations > 0" variant="danger">
               {{ $store.state.openCreations }}
             </b-badge>
           </template>
         </b-tab>
-        <b-tab
-          :title="$t('contributions.confirms')"
-          :title-link-attributes="{ 'data-test': 'confirmed' }"
-        />
-        <b-tab
-          :title="$t('contributions.denied')"
-          :title-link-attributes="{ 'data-test': 'denied' }"
-        />
-        <b-tab
-          :title="$t('contributions.deleted')"
-          :title-link-attributes="{ 'data-test': 'deleted' }"
-        />
-        <b-tab :title="$t('contributions.all')" :title-link-attributes="{ 'data-test': 'all' }" />
+        <b-tab :title-link-attributes="{ 'data-test': 'confirmed' }">
+          <template #title>
+            <b-icon icon="check" variant="success"></b-icon>
+            {{ $t('contributions.confirms') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'denied' }">
+          <template #title>
+            <b-icon icon="x-circle" variant="warning"></b-icon>
+            {{ $t('contributions.denied') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'deleted' }">
+          <template #title>
+            <b-icon icon="trash" variant="danger"></b-icon>
+            {{ $t('contributions.deleted') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'all' }">
+          <template #title>
+            <b-icon icon="list"></b-icon>
+            {{ $t('contributions.all') }}
+          </template>
+        </b-tab>
       </b-tabs>
     </div>
     <open-creations-table
@@ -73,7 +85,7 @@
 <script>
 import Overlay from '../components/Overlay'
 import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
-import { listAllContributions } from '../graphql/listAllContributions'
+import { adminListAllContributions } from '../graphql/adminListAllContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { denyContribution } from '../graphql/denyContribution'
@@ -172,19 +184,17 @@ export default {
       this.items.find((obj) => obj.id === id).messagesCount++
       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
     },
-  },
-  watch: {
-    statusFilter() {
-      this.$apollo.queries.ListAllContributions.refetch()
+    formatDateOrDash(value) {
+      return value ? this.$d(new Date(value), 'short') : '—'
     },
   },
   computed: {
     fields() {
       return [
         [
+          // open contributions
           { key: 'bookmark', label: this.$t('delete') },
           { key: 'deny', label: this.$t('deny') },
-          { key: 'email', label: this.$t('e_mail') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -199,14 +209,15 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
-          { key: 'editCreation', label: this.$t('edit') },
+          { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],
         [
+          // confirmed contributions
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -221,27 +232,28 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
-          { key: 'reActive', label: 'reActive' },
+          // denied contributions
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -256,29 +268,28 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'deniedAt',
             label: this.$t('contributions.denied'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
-          { key: 'deniedBy', label: this.$t('mod') },
+          { key: 'deniedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
-        [],
         [
-          { key: 'state', label: 'state' },
+          // deleted contributions
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -293,24 +304,61 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'deletedAt',
+            label: this.$t('contributions.deleted'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          { key: 'deletedBy', label: this.$t('moderator') },
+          { key: 'chatCreation', label: this.$t('chat') },
+        ],
+        [
+          // all contributions
+          { key: 'state', label: this.$t('status') },
+          { key: 'firstName', label: this.$t('firstname') },
+          { key: 'lastName', label: this.$t('lastname') },
+          {
+            key: 'amount',
+            label: this.$t('creation'),
+            formatter: (value) => {
+              return value + ' GDD'
+            },
+          },
+          { key: 'memo', label: this.$t('text'), class: 'text-break' },
+          {
+            key: 'contributionDate',
+            label: this.$t('created'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
+            },
+          },
+          {
+            key: 'createdAt',
+            label: this.$t('createdAt'),
+            formatter: (value) => {
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return this.formatDateOrDash(value)
             },
           },
-          { key: 'confirmedBy', label: this.$t('mod') },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
       ][this.tabIndex]
@@ -349,19 +397,22 @@ export default {
   apollo: {
     ListAllContributions: {
       query() {
-        return listAllContributions
+        return adminListAllContributions
       },
       variables() {
-        // may be at some point we need a pagination here
         return {
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           statusFilter: this.statusFilter,
         }
       },
-      update({ listAllContributions }) {
-        this.rows = listAllContributions.contributionCount
-        this.items = listAllContributions.contributionList
+      fetchPolicy: 'no-cache',
+      update({ adminListAllContributions }) {
+        this.rows = adminListAllContributions.contributionCount
+        this.items = adminListAllContributions.contributionList
+        if (this.statusFilter === FILTER_TAB_MAP[0]) {
+          this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+        }
       },
       error({ message }) {
         this.toastError(message)
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 43517833d..beb5bc2dd 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils'
 import Overview from './Overview'
-import { listAllContributions } from '../graphql/listAllContributions'
+import { adminListAllContributions } from '../graphql/adminListAllContributions'
 import VueApollo from 'vue-apollo'
 import { createMockClient } from 'mock-apollo-client'
 import { toastErrorSpy } from '../../test/testSetup'
@@ -30,7 +30,7 @@ const mocks = {
 
 const defaultData = () => {
   return {
-    listAllContributions: {
+    adminListAllContributions: {
       contributionCount: 2,
       contributionList: [
         {
@@ -84,11 +84,11 @@ const defaultData = () => {
 
 describe('Overview', () => {
   let wrapper
-  const listAllContributionsMock = jest.fn()
+  const adminListAllContributionsMock = jest.fn()
 
   mockClient.setRequestHandler(
-    listAllContributions,
-    listAllContributionsMock
+    adminListAllContributions,
+    adminListAllContributionsMock
       .mockRejectedValueOnce({ message: 'Ouch!' })
       .mockResolvedValue({ data: defaultData() }),
   )
@@ -109,8 +109,8 @@ describe('Overview', () => {
       })
     })
 
-    it('calls the listAllContributions query', () => {
-      expect(listAllContributionsMock).toBeCalledWith({
+    it('calls the adminListAllContributions query', () => {
+      expect(adminListAllContributionsMock).toBeCalledWith({
         currentPage: 1,
         order: 'DESC',
         pageSize: 25,
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index cd4d97ba8..c5316a35b 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -31,7 +31,7 @@
   </div>
 </template>
 <script>
-import { listAllContributions } from '../graphql/listAllContributions'
+import { adminListAllContributions } from '../graphql/adminListAllContributions'
 
 export default {
   name: 'overview',
@@ -43,7 +43,7 @@ export default {
   apollo: {
     AllContributions: {
       query() {
-        return listAllContributions
+        return adminListAllContributions
       },
       variables() {
         // may be at some point we need a pagination here
@@ -51,8 +51,8 @@ export default {
           statusFilter: this.statusFilter,
         }
       },
-      update({ listAllContributions }) {
-        this.$store.commit('setOpenCreations', listAllContributions.contributionCount)
+      update({ adminListAllContributions }) {
+        this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
       },
       error({ message }) {
         this.toastError(message)
diff --git a/backend/.env.test_e2e b/backend/.env.test_e2e
index a5cdc4bfd..99d6c14d5 100644
--- a/backend/.env.test_e2e
+++ b/backend/.env.test_e2e
@@ -1,5 +1,5 @@
 # Server
-JWT_EXPIRES_IN=1m
+JWT_EXPIRES_IN=2m
 
 # Email
 EMAIL=true
diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index f213be8c6..096e4d60a 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -2,16 +2,10 @@ module.exports = {
   root: true,
   env: {
     node: true,
-    // jest: true,
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['prettier', '@typescript-eslint' /*, 'jest' */],
-  extends: [
-    'standard',
-    'eslint:recommended',
-    'plugin:prettier/recommended',
-    'plugin:@typescript-eslint/recommended',
-  ],
+  plugins: ['prettier', '@typescript-eslint', 'type-graphql'],
+  extends: ['standard', 'eslint:recommended', 'plugin:prettier/recommended'],
   // add your custom rules here
   rules: {
     'no-console': ['error'],
@@ -23,4 +17,28 @@ module.exports = {
       },
     ],
   },
+  overrides: [
+    // only for ts files
+    {
+      files: ['*.ts'],
+      extends: [
+        'plugin:@typescript-eslint/recommended',
+        'plugin:@typescript-eslint/recommended-requiring-type-checking',
+        'plugin:type-graphql/recommended',
+      ],
+      rules: {
+        // allow explicitly defined dangling promises
+        '@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
+        'no-void': ['error', { allowAsStatement: true }],
+        // ignore prefer-regexp-exec rule to allow string.match(regex)
+        '@typescript-eslint/prefer-regexp-exec': 'off',
+      },
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json'],
+        // this is to properly reference the referenced project database without requirement of compiling it
+        EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
+      },
+    },
+  ],
 }
diff --git a/backend/jest.config.js b/backend/jest.config.js
index d6683d292..cd63f11d8 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -4,6 +4,11 @@ module.exports = {
   preset: 'ts-jest',
   collectCoverage: true,
   collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
+  coverageThreshold: {
+    global: {
+      lines: 80,
+    },
+  },
   setupFiles: ['<rootDir>/test/testSetup.ts'],
   setupFilesAfterEnv: ['<rootDir>/test/extensions.ts'],
   modulePathIgnorePatterns: ['<rootDir>/build/'],
diff --git a/backend/package.json b/backend/package.json
index ec9e63a7a..22e75f4af 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.18.2",
+  "version": "1.19.1",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
@@ -13,7 +13,7 @@
     "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
-    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
+    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles",
     "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
     "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts",
     "locales": "scripts/sort.sh"
@@ -65,6 +65,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-type-graphql": "^1.0.0",
     "faker": "^5.5.3",
     "jest": "^27.2.4",
     "nodemon": "^2.0.7",
diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts
index 4039e3a98..eff0c408a 100644
--- a/backend/src/apis/HttpRequest.ts
+++ b/backend/src/apis/HttpRequest.ts
@@ -1,16 +1,19 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import axios from 'axios'
 
 import { backendLogger as logger } from '@/server/logger'
+import LogError from '@/server/LogError'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const apiPost = async (url: string, payload: unknown): Promise<any> => {
-  logger.trace('POST: url=' + url + ' payload=' + payload)
+  logger.trace('POST', url, payload)
   return axios
     .post(url, payload)
     .then((result) => {
-      logger.trace('POST-Response: result=' + result)
+      logger.trace('POST-Response', result)
       if (result.status !== 200) {
-        throw new Error('HTTP Status Error ' + result.status)
+        throw new LogError('HTTP Status Error', result.status)
       }
       if (result.data.state !== 'success') {
         throw new Error(result.data.msg)
@@ -28,9 +31,9 @@ export const apiGet = async (url: string): Promise<any> => {
   return axios
     .get(url)
     .then((result) => {
-      logger.trace('GET-Response: result=' + result)
+      logger.trace('GET-Response', result)
       if (result.status !== 200) {
-        throw new Error('HTTP Status Error ' + result.status)
+        throw new LogError('HTTP Status Error', result.status)
       }
       if (!['success', 'warning'].includes(result.data.state)) {
         throw new Error(result.data.msg)
diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts
index 824d40af2..fe9ad563a 100644
--- a/backend/src/apis/KlicktippController.ts
+++ b/backend/src/apis/KlicktippController.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { KlicktippConnector } from './klicktippConnector'
diff --git a/backend/src/apis/klicktippConnector.ts b/backend/src/apis/klicktippConnector.ts
index b084112ae..0ff741604 100644
--- a/backend/src/apis/klicktippConnector.ts
+++ b/backend/src/apis/klicktippConnector.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import axios, { AxiosRequestConfig, Method } from 'axios'
diff --git a/backend/src/auth/INALIENABLE_RIGHTS.ts b/backend/src/auth/INALIENABLE_RIGHTS.ts
index 348cd5b20..adca3640f 100644
--- a/backend/src/auth/INALIENABLE_RIGHTS.ts
+++ b/backend/src/auth/INALIENABLE_RIGHTS.ts
@@ -2,7 +2,6 @@ import { RIGHTS } from './RIGHTS'
 
 export const INALIENABLE_RIGHTS = [
   RIGHTS.LOGIN,
-  RIGHTS.GET_COMMUNITY_INFO,
   RIGHTS.COMMUNITIES,
   RIGHTS.CREATE_USER,
   RIGHTS.SEND_RESET_PASSWORD_EMAIL,
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 8b0e82c86..7ee60dbe5 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -2,7 +2,6 @@ export enum RIGHTS {
   LOGIN = 'LOGIN',
   VERIFY_LOGIN = 'VERIFY_LOGIN',
   BALANCE = 'BALANCE',
-  GET_COMMUNITY_INFO = 'GET_COMMUNITY_INFO',
   COMMUNITIES = 'COMMUNITIES',
   LIST_GDT_ENTRIES = 'LIST_GDT_ENTRIES',
   EXIST_PID = 'EXIST_PID',
@@ -54,4 +53,5 @@ export enum RIGHTS {
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
   DENY_CONTRIBUTION = 'DENY_CONTRIBUTION',
+  ADMIN_OPEN_CREATIONS = 'ADMIN_OPEN_CREATIONS',
 }
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 27b51b47d..961d83219 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0060-update_communities_table',
+  DB_VERSION: '0061-event_refactoring',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index eb4b26b92..f3c75a7a6 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
 import { logger, i18n } from '@test/testSetup'
 import CONFIG from '@/config'
@@ -8,6 +10,7 @@ CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'
 CONFIG.EMAIL_SMTP_PORT = '1234'
 CONFIG.EMAIL_USERNAME = 'user'
 CONFIG.EMAIL_PASSWORD = 'pwd'
+CONFIG.EMAIL_TLS = true
 
 jest.mock('nodemailer', () => {
   return {
diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts
index 9fa8af73f..d8ecd3d38 100644
--- a/backend/src/emails/sendEmailTranslated.ts
+++ b/backend/src/emails/sendEmailTranslated.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import CONFIG from '@/config'
 import { backendLogger as logger } from '@/server/logger'
 import path from 'path'
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index 7e499feb9..21c10bdad 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -1,5 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Decimal from 'decimal.js-light'
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
@@ -106,7 +109,7 @@ describe('sendEmailVariants', () => {
           'you have received a message from Bibi Bloxberg regarding your common good contribution “My contribution.”.',
         )
         expect(result.originalMessage.html).toContain(
-          'To view and reply to the message, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
+          'To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!',
         )
         expect(result.originalMessage.html).toContain(
           `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
@@ -424,7 +427,7 @@ describe('sendEmailVariants', () => {
           'Your public good contribution “My contribution.” was rejected by Bibi Bloxberg.',
         )
         expect(result.originalMessage.html).toContain(
-          'To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
+          'To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!',
         )
         expect(result.originalMessage.html).toContain(
           `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
@@ -502,7 +505,7 @@ describe('sendEmailVariants', () => {
           'Your public good contribution “My contribution.” was deleted by Bibi Bloxberg.',
         )
         expect(result.originalMessage.html).toContain(
-          'To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
+          'To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!',
         )
         expect(result.originalMessage.html).toContain(
           `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index 8e65d85f2..7ed75fd45 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -1,212 +1,217 @@
-import { EventProtocol as DbEvent } from '@entity/EventProtocol'
+import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
+import { Contribution as DbContribution } from '@entity/Contribution'
+import { Transaction as DbTransaction } from '@entity/Transaction'
 import Decimal from 'decimal.js-light'
 import { EventProtocolType } from './EventProtocolType'
 
 export const Event = (
   type: EventProtocolType,
-  userId: number,
-  xUserId: number | null = null,
-  xCommunityId: number | null = null,
-  transactionId: number | null = null,
-  contributionId: number | null = null,
+  affectedUser: DbUser,
+  actingUser: DbUser,
+  involvedUser: DbUser | null = null,
+  involvedTransaction: DbTransaction | null = null,
+  involvedContribution: DbContribution | null = null,
+  involvedContributionMessage: DbContributionMessage | null = null,
   amount: Decimal | null = null,
-  messageId: number | null = null,
 ): DbEvent => {
   const event = new DbEvent()
   event.type = type
-  event.userId = userId
-  event.xUserId = xUserId
-  event.xCommunityId = xCommunityId
-  event.transactionId = transactionId
-  event.contributionId = contributionId
+  event.affectedUser = affectedUser
+  event.actingUser = actingUser
+  event.involvedUser = involvedUser
+  event.involvedTransaction = involvedTransaction
+  event.involvedContribution = involvedContribution
+  event.involvedContributionMessage = involvedContributionMessage
   event.amount = amount
-  event.messageId = messageId
   return event
 }
 
 export const EVENT_CONTRIBUTION_CREATE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.CONTRIBUTION_CREATE,
-    userId,
+    user,
+    user,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_CONTRIBUTION_DELETE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.CONTRIBUTION_DELETE,
-    userId,
+    user,
+    user,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_CONTRIBUTION_UPDATE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.CONTRIBUTION_UPDATE,
-    userId,
+    user,
+    user,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  moderator: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.ADMIN_CONTRIBUTION_CREATE,
-    userId,
+    user,
+    moderator,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  moderator: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.ADMIN_CONTRIBUTION_UPDATE,
-    userId,
+    user,
+    moderator,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  moderator: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.ADMIN_CONTRIBUTION_DELETE,
-    userId,
+    user,
+    moderator,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_CONTRIBUTION_CONFIRM = async (
-  userId: number,
-  contributionId: number,
+  user: DbUser,
+  moderator: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.CONTRIBUTION_CONFIRM,
-    userId,
+    user,
+    moderator,
     null,
     null,
+    contribution,
     null,
-    contributionId,
     amount,
   ).save()
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (
-  userId: number,
-  xUserId: number,
-  contributionId: number,
+  user: DbUser,
+  moderator: DbUser,
+  contribution: DbContribution,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.ADMIN_CONTRIBUTION_DENY,
-    userId,
-    xUserId,
+    user,
+    moderator,
     null,
     null,
-    contributionId,
+    contribution,
+    null,
     amount,
   ).save()
 
 export const EVENT_TRANSACTION_SEND = async (
-  userId: number,
-  xUserId: number,
-  transactionId: number,
+  user: DbUser,
+  involvedUser: DbUser,
+  transaction: DbTransaction,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.TRANSACTION_SEND,
-    userId,
-    xUserId,
+    user,
+    user,
+    involvedUser,
+    transaction,
     null,
-    transactionId,
     null,
     amount,
   ).save()
 
 export const EVENT_TRANSACTION_RECEIVE = async (
-  userId: number,
-  xUserId: number,
-  transactionId: number,
+  user: DbUser,
+  involvedUser: DbUser,
+  transaction: DbTransaction,
   amount: Decimal,
 ): Promise<DbEvent> =>
   Event(
     EventProtocolType.TRANSACTION_RECEIVE,
-    userId,
-    xUserId,
+    user,
+    involvedUser,
+    involvedUser,
+    transaction,
     null,
-    transactionId,
     null,
     amount,
   ).save()
 
-export const EVENT_LOGIN = async (userId: number): Promise<DbEvent> =>
-  Event(EventProtocolType.LOGIN, userId, null, null, null, null, null, null).save()
+export const EVENT_LOGIN = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventProtocolType.LOGIN, user, user).save()
 
-export const EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = async (
-  userId: number,
-): Promise<DbEvent> => Event(EventProtocolType.SEND_ACCOUNT_MULTIREGISTRATION_EMAIL, userId).save()
+export const EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventProtocolType.SEND_ACCOUNT_MULTIREGISTRATION_EMAIL, user, { id: 0 } as DbUser).save()
 
-export const EVENT_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise<DbEvent> =>
-  Event(EventProtocolType.SEND_CONFIRMATION_EMAIL, userId).save()
+export const EVENT_SEND_CONFIRMATION_EMAIL = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventProtocolType.SEND_CONFIRMATION_EMAIL, user, user).save()
 
-export const EVENT_ADMIN_SEND_CONFIRMATION_EMAIL = async (userId: number): Promise<DbEvent> =>
-  Event(EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL, userId).save()
+export const EVENT_ADMIN_SEND_CONFIRMATION_EMAIL = async (
+  user: DbUser,
+  moderator: DbUser,
+): Promise<DbEvent> =>
+  Event(EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL, user, moderator).save()
 
-/* export const EVENT_REDEEM_REGISTER = async (
-  userId: number,
-  transactionId: number | null = null,
-  contributionId: number | null = null,
-): Promise<Event> =>
-  Event(
-    EventProtocolType.REDEEM_REGISTER,
-    userId,
-    null,
-    null,
-    transactionId,
-    contributionId,
-  ).save()
-*/
+export const EVENT_REGISTER = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventProtocolType.REGISTER, user, user).save()
 
-export const EVENT_REGISTER = async (userId: number): Promise<DbEvent> =>
-  Event(EventProtocolType.REGISTER, userId).save()
-
-export const EVENT_ACTIVATE_ACCOUNT = async (userId: number): Promise<DbEvent> =>
-  Event(EventProtocolType.ACTIVATE_ACCOUNT, userId).save()
+export const EVENT_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventProtocolType.ACTIVATE_ACCOUNT, user, user).save()
diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index 1c0ec4996..1e676a1a7 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { gql } from 'graphql-request'
 import { backendLogger as logger } from '@/server/logger'
 import { Community as DbCommunity } from '@entity/Community'
@@ -18,9 +21,13 @@ export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string |
       }
     }
   `
+  const variables = {}
 
   try {
-    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(query)
+    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
+      query,
+      variables,
+    )
     logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
     if (data) {
       logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts
index 1c0ec4996..4b3e8f487 100644
--- a/backend/src/federation/client/1_1/FederationClient.ts
+++ b/backend/src/federation/client/1_1/FederationClient.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { gql } from 'graphql-request'
 import { backendLogger as logger } from '@/server/logger'
 import { Community as DbCommunity } from '@entity/Community'
@@ -18,9 +21,13 @@ export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string |
       }
     }
   `
+  const variables = {}
 
   try {
-    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(query)
+    const { data, errors, extensions, headers, status } = await graphQLClient.rawRequest(
+      query,
+      variables,
+    )
     logger.debug(`Response-Data:`, data, errors, extensions, headers, status)
     if (data) {
       logger.debug(`Response-PublicKey:`, data.getPublicKey.publicKey)
diff --git a/backend/src/federation/client/GraphQLGetClient.ts b/backend/src/federation/client/GraphQLGetClient.ts
index 7e2d89b6c..2f5281532 100644
--- a/backend/src/federation/client/GraphQLGetClient.ts
+++ b/backend/src/federation/client/GraphQLGetClient.ts
@@ -1,8 +1,14 @@
 import { GraphQLClient } from 'graphql-request'
 import { PatchedRequestInit } from 'graphql-request/dist/types'
 
+type ClientInstance = {
+  url: string
+  // eslint-disable-next-line no-use-before-define
+  client: GraphQLGetClient
+}
+
 export class GraphQLGetClient extends GraphQLClient {
-  private static instance: GraphQLGetClient
+  private static instanceArray: ClientInstance[] = []
 
   /**
    * The Singleton's constructor should always be private to prevent direct
@@ -20,16 +26,18 @@ export class GraphQLGetClient extends GraphQLClient {
    * just one instance of each subclass around.
    */
   public static getInstance(url: string): GraphQLGetClient {
-    if (!GraphQLGetClient.instance) {
-      GraphQLGetClient.instance = new GraphQLGetClient(url, {
-        method: 'GET',
-        jsonSerializer: {
-          parse: JSON.parse,
-          stringify: JSON.stringify,
-        },
-      })
+    const instance = GraphQLGetClient.instanceArray.find((instance) => instance.url === url)
+    if (instance) {
+      return instance.client
     }
-
-    return GraphQLGetClient.instance
+    const client = new GraphQLGetClient(url, {
+      method: 'GET',
+      jsonSerializer: {
+        parse: JSON.parse,
+        stringify: JSON.stringify,
+      },
+    })
+    GraphQLGetClient.instanceArray.push({ url, client } as ClientInstance)
+    return client
   }
 }
diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts
index 4899a2987..599564ea6 100644
--- a/backend/src/federation/validateCommunities.test.ts
+++ b/backend/src/federation/validateCommunities.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -150,7 +154,8 @@ describe('validate Communities', () => {
       })
       it('logs unsupported api for community with api 2_0 ', () => {
         expect(logger.warn).toBeCalledWith(
-          `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=2_0; supported versions=1_0,1_1`,
+          `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=2_0; supported versions`,
+          ['1_0', '1_1'],
         )
       })
     })
diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts
index f5a0c50ac..dfd46a3e9 100644
--- a/backend/src/federation/validateCommunities.ts
+++ b/backend/src/federation/validateCommunities.ts
@@ -8,14 +8,14 @@ import { backendLogger as logger } from '@/server/logger'
 import { ApiVersionType } from './enum/apiVersionType'
 import LogError from '@/server/LogError'
 
-export async function startValidateCommunities(timerInterval: number): Promise<void> {
+export function startValidateCommunities(timerInterval: number): void {
   logger.info(
     `Federation: startValidateCommunities loop with an interval of ${timerInterval} ms...`,
   )
   // TODO: replace the timer-loop by an event-based communication to verify announced foreign communities
   // better to use setTimeout twice than setInterval once -> see https://javascript.info/settimeout-setinterval
   setTimeout(function run() {
-    validateCommunities()
+    void validateCommunities()
     setTimeout(run, timerInterval)
   }, timerInterval)
 }
@@ -27,8 +27,8 @@ export async function validateCommunities(): Promise<void> {
     .getMany()
 
   logger.debug(`Federation: found ${dbCommunities.length} dbCommunities`)
-  dbCommunities.forEach(async function (dbCom) {
-    logger.debug(`Federation: dbCom: ${JSON.stringify(dbCom)}`)
+  for (const dbCom of dbCommunities) {
+    logger.debug('Federation: dbCom', dbCom)
     const apiValueStrings: string[] = Object.values(ApiVersionType)
     logger.debug(`suppported ApiVersions=`, apiValueStrings)
     if (apiValueStrings.includes(dbCom.apiVersion)) {
@@ -38,19 +38,22 @@ export async function validateCommunities(): Promise<void> {
       try {
         const pubKey = await invokeVersionedRequestGetPublicKey(dbCom)
         logger.info(
-          `Federation: received publicKey=${pubKey} from endpoint=${dbCom.endPoint}/${dbCom.apiVersion}`,
+          'Federation: received publicKey from endpoint',
+          pubKey,
+          `${dbCom.endPoint}/${dbCom.apiVersion}`,
         )
-        if (pubKey && pubKey === dbCom.publicKey.toString('hex')) {
+        if (pubKey && pubKey === dbCom.publicKey.toString()) {
           logger.info(`Federation: matching publicKey:  ${pubKey}`)
-          DbCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() })
+          await DbCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() })
           logger.debug(`Federation: updated dbCom:  ${JSON.stringify(dbCom)}`)
+        } else {
+          logger.warn(
+            `Federation: received not matching publicKey -> received: ${
+              pubKey || 'null'
+            }, expected: ${dbCom.publicKey.toString()} `,
+          )
+          // DbCommunity.delete({ id: dbCom.id })
         }
-        /*
-        else {
-          logger.warn(`Federation: received unknown publicKey -> delete dbCom with id=${dbCom.id} `)
-          DbCommunity.delete({ id: dbCom.id })
-        }
-        */
       } catch (err) {
         if (!isLogError(err)) {
           logger.error(`Error:`, err)
@@ -58,10 +61,11 @@ export async function validateCommunities(): Promise<void> {
       }
     } else {
       logger.warn(
-        `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=${dbCom.apiVersion}; supported versions=${apiValueStrings}`,
+        `Federation: dbCom: ${dbCom.id} with unsupported apiVersion=${dbCom.apiVersion}; supported versions`,
+        apiValueStrings,
       )
     }
-  })
+  }
 }
 
 function isLogError(err: unknown) {
diff --git a/backend/src/graphql/arg/ContributionLinkArgs.ts b/backend/src/graphql/arg/ContributionLinkArgs.ts
index 7344a28ff..cf0465501 100644
--- a/backend/src/graphql/arg/ContributionLinkArgs.ts
+++ b/backend/src/graphql/arg/ContributionLinkArgs.ts
@@ -22,7 +22,7 @@ export default class ContributionLinkArgs {
   validTo?: string | null
 
   @Field(() => Decimal, { nullable: true })
-  maxAmountPerMonth: Decimal | null
+  maxAmountPerMonth?: Decimal | null
 
   @Field(() => Int)
   maxPerCycle: number
diff --git a/backend/src/graphql/arg/ContributionMessageArgs.ts b/backend/src/graphql/arg/ContributionMessageArgs.ts
index dd75baed0..8b44756a6 100644
--- a/backend/src/graphql/arg/ContributionMessageArgs.ts
+++ b/backend/src/graphql/arg/ContributionMessageArgs.ts
@@ -1,9 +1,9 @@
-import { ArgsType, Field, InputType } from 'type-graphql'
+import { ArgsType, Field, Int, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
 export default class ContributionMessageArgs {
-  @Field(() => Number)
+  @Field(() => Int)
   contributionId: number
 
   @Field(() => String)
diff --git a/backend/src/graphql/arg/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts
index af915b91a..56acfd63d 100644
--- a/backend/src/graphql/arg/CreateUserArgs.ts
+++ b/backend/src/graphql/arg/CreateUserArgs.ts
@@ -11,11 +11,11 @@ export default class CreateUserArgs {
   @Field(() => String)
   lastName: string
 
-  @Field(() => String)
-  language?: string // Will default to DEFAULT_LANGUAGE
+  @Field(() => String, { nullable: true })
+  language?: string | null
 
   @Field(() => Int, { nullable: true })
-  publisherId: number
+  publisherId?: number | null
 
   @Field(() => String, { nullable: true })
   redeemCode?: string | null
diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts
index 97326caf2..290dba337 100644
--- a/backend/src/graphql/arg/Paginated.ts
+++ b/backend/src/graphql/arg/Paginated.ts
@@ -1,3 +1,4 @@
+/* eslint-disable type-graphql/invalid-nullable-input-type */
 import { ArgsType, Field, Int } from 'type-graphql'
 import { Order } from '@enum/Order'
 
diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts
index 38057762d..39996efca 100644
--- a/backend/src/graphql/arg/SearchUsersArgs.ts
+++ b/backend/src/graphql/arg/SearchUsersArgs.ts
@@ -7,11 +7,14 @@ export default class SearchUsersArgs {
   searchText: string
 
   @Field(() => Int, { nullable: true })
+  // eslint-disable-next-line type-graphql/invalid-nullable-input-type
   currentPage?: number
 
   @Field(() => Int, { nullable: true })
+  // eslint-disable-next-line type-graphql/invalid-nullable-input-type
   pageSize?: number
 
+  // eslint-disable-next-line type-graphql/wrong-decorator-signature
   @Field(() => SearchUsersFilters, { nullable: true, defaultValue: null })
-  filters: SearchUsersFilters
+  filters?: SearchUsersFilters | null
 }
diff --git a/backend/src/graphql/arg/SearchUsersFilters.ts b/backend/src/graphql/arg/SearchUsersFilters.ts
index dc19d456c..efcdfa00d 100644
--- a/backend/src/graphql/arg/SearchUsersFilters.ts
+++ b/backend/src/graphql/arg/SearchUsersFilters.ts
@@ -3,8 +3,8 @@ import { Field, InputType } from 'type-graphql'
 @InputType()
 export default class SearchUsersFilters {
   @Field(() => Boolean, { nullable: true, defaultValue: null })
-  byActivated: boolean
+  byActivated?: boolean | null
 
   @Field(() => Boolean, { nullable: true, defaultValue: null })
-  byDeleted: boolean
+  byDeleted?: boolean | null
 }
diff --git a/backend/src/graphql/arg/TransactionLinkFilters.ts b/backend/src/graphql/arg/TransactionLinkFilters.ts
index 291d244c3..13d630d17 100644
--- a/backend/src/graphql/arg/TransactionLinkFilters.ts
+++ b/backend/src/graphql/arg/TransactionLinkFilters.ts
@@ -1,13 +1,14 @@
+/* eslint-disable type-graphql/invalid-nullable-input-type */
 import { Field, InputType } from 'type-graphql'
 
 @InputType()
 export default class TransactionLinkFilters {
   @Field(() => Boolean, { nullable: true })
-  withDeleted: boolean
+  withDeleted?: boolean
 
   @Field(() => Boolean, { nullable: true })
-  withExpired: boolean
+  withExpired?: boolean
 
   @Field(() => Boolean, { nullable: true })
-  withRedeemed: boolean
+  withRedeemed?: boolean
 }
diff --git a/backend/src/graphql/arg/UnsecureLoginArgs.ts b/backend/src/graphql/arg/UnsecureLoginArgs.ts
index ac69e7441..a2a7bb683 100644
--- a/backend/src/graphql/arg/UnsecureLoginArgs.ts
+++ b/backend/src/graphql/arg/UnsecureLoginArgs.ts
@@ -9,5 +9,5 @@ export default class UnsecureLoginArgs {
   password: string
 
   @Field(() => Int, { nullable: true })
-  publisherId: number
+  publisherId?: number | null
 }
diff --git a/backend/src/graphql/arg/UpdateUserInfosArgs.ts b/backend/src/graphql/arg/UpdateUserInfosArgs.ts
index b45539487..985d3fed6 100644
--- a/backend/src/graphql/arg/UpdateUserInfosArgs.ts
+++ b/backend/src/graphql/arg/UpdateUserInfosArgs.ts
@@ -1,4 +1,4 @@
-import { ArgsType, Field } from 'type-graphql'
+import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
 export default class UpdateUserInfosArgs {
@@ -11,8 +11,8 @@ export default class UpdateUserInfosArgs {
   @Field({ nullable: true })
   language?: string
 
-  @Field({ nullable: true })
-  publisherId?: number
+  @Field(() => Int, { nullable: true })
+  publisherId?: number | null
 
   @Field({ nullable: true })
   password?: string
diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 59daa89f1..709f470d4 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { AuthChecker } from 'type-graphql'
diff --git a/backend/src/graphql/model/Balance.ts b/backend/src/graphql/model/Balance.ts
index f04b235ee..9b54f6987 100644
--- a/backend/src/graphql/model/Balance.ts
+++ b/backend/src/graphql/model/Balance.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int, Float } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 
 @ObjectType()
@@ -19,14 +19,14 @@ export class Balance {
   @Field(() => Decimal)
   balance: Decimal
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Float, { nullable: true })
   balanceGDT: number | null
 
   // the count of all transactions
-  @Field(() => Number)
+  @Field(() => Int)
   count: number
 
   // the count of transaction links
-  @Field(() => Number)
+  @Field(() => Int)
   linkCount: number
 }
diff --git a/backend/src/graphql/model/Community.ts b/backend/src/graphql/model/Community.ts
index 466028d00..ec91ad36f 100644
--- a/backend/src/graphql/model/Community.ts
+++ b/backend/src/graphql/model/Community.ts
@@ -1,31 +1,47 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
+import { Community as DbCommunity } from '@entity/Community'
 
 @ObjectType()
 export class Community {
-  constructor(json?: any) {
-    if (json) {
-      this.id = Number(json.id)
-      this.name = json.name
-      this.url = json.url
-      this.description = json.description
-      this.registerUrl = json.registerUrl
-    }
+  constructor(dbCom: DbCommunity) {
+    this.id = dbCom.id
+    this.foreign = dbCom.foreign
+    this.publicKey = dbCom.publicKey.toString()
+    this.url =
+      (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') +
+      'api/' +
+      dbCom.apiVersion
+    this.lastAnnouncedAt = dbCom.lastAnnouncedAt
+    this.verifiedAt = dbCom.verifiedAt
+    this.lastErrorAt = dbCom.lastErrorAt
+    this.createdAt = dbCom.createdAt
+    this.updatedAt = dbCom.updatedAt
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
+  @Field(() => Boolean)
+  foreign: boolean
+
   @Field(() => String)
-  name: string
+  publicKey: string
 
   @Field(() => String)
   url: string
 
-  @Field(() => String)
-  description: string
+  @Field(() => Date, { nullable: true })
+  lastAnnouncedAt: Date | null
 
-  @Field(() => String)
-  registerUrl: string
+  @Field(() => Date, { nullable: true })
+  verifiedAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  lastErrorAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  createdAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  updatedAt: Date | null
 }
diff --git a/backend/src/graphql/model/CommunityStatistics.ts b/backend/src/graphql/model/CommunityStatistics.ts
index 87ef595af..4864b630d 100644
--- a/backend/src/graphql/model/CommunityStatistics.ts
+++ b/backend/src/graphql/model/CommunityStatistics.ts
@@ -1,9 +1,9 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 
 @ObjectType()
 export class DynamicStatisticsFields {
-  @Field(() => Number)
+  @Field(() => Int)
   activeUsers: number
 
   @Field(() => Decimal)
@@ -15,13 +15,13 @@ export class DynamicStatisticsFields {
 
 @ObjectType()
 export class CommunityStatistics {
-  @Field(() => Number)
+  @Field(() => Int)
   allUsers: number
 
-  @Field(() => Number)
+  @Field(() => Int)
   totalUsers: number
 
-  @Field(() => Number)
+  @Field(() => Int)
   deletedUsers: number
 
   @Field(() => Decimal)
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index d71d2ce6b..a683534af 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -12,7 +12,6 @@ export class Contribution {
     this.amount = contribution.amount
     this.memo = contribution.memo
     this.createdAt = contribution.createdAt
-    this.deletedAt = contribution.deletedAt
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
@@ -20,9 +19,11 @@ export class Contribution {
     this.messagesCount = contribution.messages ? contribution.messages.length : 0
     this.deniedAt = contribution.deniedAt
     this.deniedBy = contribution.deniedBy
+    this.deletedAt = contribution.deletedAt
+    this.deletedBy = contribution.deletedBy
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => String, { nullable: true })
@@ -40,25 +41,28 @@ export class Contribution {
   @Field(() => Date)
   createdAt: Date
 
-  @Field(() => Date, { nullable: true })
-  deletedAt: Date | null
-
   @Field(() => Date, { nullable: true })
   confirmedAt: Date | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   confirmedBy: number | null
 
   @Field(() => Date, { nullable: true })
   deniedAt: Date | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   deniedBy: number | null
 
+  @Field(() => Date, { nullable: true })
+  deletedAt: Date | null
+
+  @Field(() => Int, { nullable: true })
+  deletedBy: number | null
+
   @Field(() => Date)
   contributionDate: Date
 
-  @Field(() => Number)
+  @Field(() => Int)
   messagesCount: number
 
   @Field(() => String)
diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts
index 9fe9eccd6..7a06f8dff 100644
--- a/backend/src/graphql/model/ContributionLink.ts
+++ b/backend/src/graphql/model/ContributionLink.ts
@@ -21,7 +21,7 @@ export class ContributionLink {
     this.link = CONFIG.COMMUNITY_REDEEM_CONTRIBUTION_URL.replace(/{code}/g, this.code)
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => Decimal)
diff --git a/backend/src/graphql/model/ContributionLinkList.ts b/backend/src/graphql/model/ContributionLinkList.ts
index 412d0bf7b..d2c347b27 100644
--- a/backend/src/graphql/model/ContributionLinkList.ts
+++ b/backend/src/graphql/model/ContributionLinkList.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 import { ContributionLink } from '@model/ContributionLink'
 
 @ObjectType()
@@ -6,6 +6,6 @@ export class ContributionLinkList {
   @Field(() => [ContributionLink])
   links: ContributionLink[]
 
-  @Field(() => Number)
+  @Field(() => Int)
   count: number
 }
diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index d757db136..6bd6a4715 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -1,4 +1,4 @@
-import { Field, ObjectType } from 'type-graphql'
+import { Field, Int, ObjectType } from 'type-graphql'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { User } from '@entity/User'
 
@@ -16,7 +16,7 @@ export class ContributionMessage {
     this.isModerator = contributionMessage.isModerator
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => String)
@@ -26,7 +26,7 @@ export class ContributionMessage {
   createdAt: Date
 
   @Field(() => Date, { nullable: true })
-  updatedAt?: Date | null
+  updatedAt: Date | null
 
   @Field(() => String)
   type: string
@@ -37,7 +37,7 @@ export class ContributionMessage {
   @Field(() => String, { nullable: true })
   userLastName: string | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   userId: number | null
 
   @Field(() => Boolean)
@@ -45,7 +45,7 @@ export class ContributionMessage {
 }
 @ObjectType()
 export class ContributionMessageListResult {
-  @Field(() => Number)
+  @Field(() => Int)
   count: number
 
   @Field(() => [ContributionMessage])
diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts
index 43529fb06..bbf1cceef 100644
--- a/backend/src/graphql/model/GdtEntry.ts
+++ b/backend/src/graphql/model/GdtEntry.ts
@@ -1,6 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Float, Int } from 'type-graphql'
 import { GdtEntryType } from '@enum/GdtEntryType'
 
 @ObjectType()
@@ -19,10 +21,10 @@ export class GdtEntry {
     this.gdt = json.gdt
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
-  @Field(() => Number)
+  @Field(() => Float)
   amount: number
 
   @Field(() => String)
@@ -40,15 +42,15 @@ export class GdtEntry {
   @Field(() => GdtEntryType)
   gdtEntryType: GdtEntryType
 
-  @Field(() => Number)
+  @Field(() => Float)
   factor: number
 
-  @Field(() => Number)
+  @Field(() => Float)
   amount2: number
 
-  @Field(() => Number)
+  @Field(() => Float)
   factor2: number
 
-  @Field(() => Number)
+  @Field(() => Float)
   gdt: number
 }
diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts
index 9d529b6f3..7c4bffb5a 100644
--- a/backend/src/graphql/model/GdtEntryList.ts
+++ b/backend/src/graphql/model/GdtEntryList.ts
@@ -1,7 +1,10 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { GdtEntry } from './GdtEntry'
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int, Float } from 'type-graphql'
 
 @ObjectType()
 export class GdtEntryList {
@@ -16,15 +19,15 @@ export class GdtEntryList {
   @Field(() => String)
   state: string
 
-  @Field(() => Number)
+  @Field(() => Int)
   count: number
 
   @Field(() => [GdtEntry], { nullable: true })
-  gdtEntries?: GdtEntry[]
+  gdtEntries: GdtEntry[] | null
 
-  @Field(() => Number)
+  @Field(() => Float)
   gdtSum: number
 
-  @Field(() => Number)
+  @Field(() => Float)
   timeUsed: number
 }
diff --git a/backend/src/graphql/model/KlickTipp.ts b/backend/src/graphql/model/KlickTipp.ts
index a7dd9eead..059c7874d 100644
--- a/backend/src/graphql/model/KlickTipp.ts
+++ b/backend/src/graphql/model/KlickTipp.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field } from 'type-graphql'
 
diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts
index a7329bcef..96b80f9a0 100644
--- a/backend/src/graphql/model/Transaction.ts
+++ b/backend/src/graphql/model/Transaction.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 import { Decay } from './Decay'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import Decimal from 'decimal.js-light'
@@ -41,19 +41,19 @@ export class Transaction {
     this.memo = transaction.memo
     this.creationDate = transaction.creationDate
     this.linkedUser = linkedUser
-    this.linkedTransactionId = transaction.linkedTransactionId
+    this.linkedTransactionId = transaction.linkedTransactionId || null
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
-      : transaction.transactionLinkId
+      : transaction.transactionLinkId || null
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => User)
   user: User
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   previous: number | null
 
   @Field(() => TransactionTypeId)
@@ -80,10 +80,10 @@ export class Transaction {
   @Field(() => User, { nullable: true })
   linkedUser: User | null
 
-  @Field(() => Number, { nullable: true })
-  linkedTransactionId?: number | null
+  @Field(() => Int, { nullable: true })
+  linkedTransactionId: number | null
 
   // Links to the TransactionLink/ContributionLink when transaction was created by a link
-  @Field(() => Number, { nullable: true })
-  linkId?: number | null
+  @Field(() => Int, { nullable: true })
+  linkId: number | null
 }
diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts
index 18a601948..b0a8ab184 100644
--- a/backend/src/graphql/model/TransactionLink.ts
+++ b/backend/src/graphql/model/TransactionLink.ts
@@ -21,7 +21,7 @@ export class TransactionLink {
     this.link = CONFIG.COMMUNITY_REDEEM_URL.replace(/{code}/g, this.code)
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => User)
@@ -61,8 +61,8 @@ export class TransactionLink {
 @ObjectType()
 export class TransactionLinkResult {
   @Field(() => Int)
-  linkCount: number
+  count: number
 
   @Field(() => [TransactionLink])
-  linkList: TransactionLink[]
+  links: TransactionLink[]
 }
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index c42b4fd11..75112ecf5 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -24,12 +24,12 @@ export class UnconfirmedContribution {
   firstName: string
 
   @Field(() => Int)
-  id?: number
+  id: number
 
   @Field(() => String)
   lastName: string
 
-  @Field(() => Number)
+  @Field(() => Int)
   userId: number
 
   @Field(() => String)
@@ -44,7 +44,7 @@ export class UnconfirmedContribution {
   @Field(() => Decimal)
   amount: Decimal
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   moderator: number | null
 
   @Field(() => [Decimal])
@@ -53,6 +53,6 @@ export class UnconfirmedContribution {
   @Field(() => String)
   state: string
 
-  @Field(() => Number)
+  @Field(() => Int)
   messageCount: number
 }
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index b4fdcae4f..aeb764941 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 import { KlickTipp } from './KlickTipp'
 import { User as dbUser } from '@entity/User'
 import { UserContact } from './UserContact'
@@ -28,21 +28,21 @@ export class User {
     this.hideAmountGDT = user.hideAmountGDT
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => String)
   gradidoID: string
 
   @Field(() => String, { nullable: true })
-  alias?: string
+  alias: string | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   emailId: number | null
 
   // TODO privacy issue here
   @Field(() => String, { nullable: true })
-  email: string
+  email: string | null
 
   @Field(() => UserContact)
   emailContact: UserContact
@@ -72,7 +72,7 @@ export class User {
   hideAmountGDT: boolean
 
   // This is not the users publisherId, but the one of the users who recommend him
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   publisherId: number | null
 
   @Field(() => Date, { nullable: true })
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 08dc405ac..e7330471b 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -17,7 +17,7 @@ export class UserAdmin {
     this.isAdmin = user.isAdmin
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   userId: number
 
   @Field(() => String)
@@ -39,10 +39,10 @@ export class UserAdmin {
   hasElopage: boolean
 
   @Field(() => Date, { nullable: true })
-  deletedAt?: Date | null
+  deletedAt: Date | null
 
   @Field(() => String, { nullable: true })
-  emailConfirmationSend?: string
+  emailConfirmationSend: string | null
 
   @Field(() => Date, { nullable: true })
   isAdmin: Date | null
diff --git a/backend/src/graphql/model/UserContact.ts b/backend/src/graphql/model/UserContact.ts
index 796c7f5f3..bb31d0745 100644
--- a/backend/src/graphql/model/UserContact.ts
+++ b/backend/src/graphql/model/UserContact.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 import { UserContact as dbUserContact } from '@entity/UserContact'
 
 @ObjectType()
@@ -18,13 +18,13 @@ export class UserContact {
     this.deletedAt = userContact.deletedAt
   }
 
-  @Field(() => Number)
+  @Field(() => Int)
   id: number
 
   @Field(() => String)
   type: string
 
-  @Field(() => Number)
+  @Field(() => Int)
   userId: number
 
   @Field(() => String)
@@ -33,10 +33,10 @@ export class UserContact {
   // @Field(() => BigInt, { nullable: true })
   // emailVerificationCode: BigInt | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   emailOptInTypeId: number | null
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   emailResendCount: number | null
 
   @Field(() => Boolean)
diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index 65cccf4d4..18aed5ae6 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import Decimal from 'decimal.js-light'
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index cb916e47c..1e8f6a00f 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -1,21 +1,25 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { createTestClient } from 'apollo-server-testing'
-import createServer from '@/server/createServer'
-import CONFIG from '@/config'
-
-jest.mock('@/config')
+import { getCommunities } from '@/seeds/graphql/queries'
+import { Community as DbCommunity } from '@entity/Community'
+import { testEnvironment } from '@test/helpers'
 
 let query: any
 
 // to do: We need a setup for the tests that closes the connection
 let con: any
+let testEnv: any
 
 beforeAll(async () => {
-  const server = await createServer({})
-  con = server.con
-  query = createTestClient(server.apollo).query
+  testEnv = await testEnvironment()
+  query = testEnv.query
+  con = testEnv.con
+  await DbCommunity.clear()
 })
 
 afterAll(async () => {
@@ -23,74 +27,90 @@ afterAll(async () => {
 })
 
 describe('CommunityResolver', () => {
-  const getCommunityInfoQuery = `
-    query {
-      getCommunityInfo {
-        name
-        description
-        url
-        registerUrl
-      }
-    }
-  `
-
-  const communities = `
-    query {
-      communities {
-        id
-        name
-        url
-        description
-        registerUrl
-      }
-    }
-  `
-
-  describe('getCommunityInfo', () => {
-    it('returns the default values', async () => {
-      await expect(query({ query: getCommunityInfoQuery })).resolves.toMatchObject({
-        data: {
-          getCommunityInfo: {
-            name: 'Gradido Entwicklung',
-            description: 'Die lokale Entwicklungsumgebung von Gradido.',
-            url: 'http://localhost/',
-            registerUrl: 'http://localhost/register',
+  describe('getCommunities', () => {
+    let homeCom1: DbCommunity
+    let homeCom2: DbCommunity
+    let homeCom3: DbCommunity
+    let foreignCom1: DbCommunity
+    let foreignCom2: DbCommunity
+    let foreignCom3: DbCommunity
+    describe('with empty list', () => {
+      it('returns no community entry', async () => {
+        // const result: Community[] = await query({ query: getCommunities })
+        // expect(result.length).toEqual(0)
+        await expect(query({ query: getCommunities })).resolves.toMatchObject({
+          data: {
+            getCommunities: [],
           },
-        },
+        })
       })
     })
-  })
 
-  describe('communities', () => {
-    describe('PRODUCTION = false', () => {
-      beforeEach(() => {
-        CONFIG.PRODUCTION = false
+    describe('only home-communities entries', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+
+        homeCom1 = DbCommunity.create()
+        homeCom1.foreign = false
+        homeCom1.publicKey = Buffer.from('publicKey-HomeCommunity')
+        homeCom1.apiVersion = '1_0'
+        homeCom1.endPoint = 'http://localhost'
+        homeCom1.createdAt = new Date()
+        await DbCommunity.insert(homeCom1)
+
+        homeCom2 = DbCommunity.create()
+        homeCom2.foreign = false
+        homeCom2.publicKey = Buffer.from('publicKey-HomeCommunity')
+        homeCom2.apiVersion = '1_1'
+        homeCom2.endPoint = 'http://localhost'
+        homeCom2.createdAt = new Date()
+        await DbCommunity.insert(homeCom2)
+
+        homeCom3 = DbCommunity.create()
+        homeCom3.foreign = false
+        homeCom3.publicKey = Buffer.from('publicKey-HomeCommunity')
+        homeCom3.apiVersion = '2_0'
+        homeCom3.endPoint = 'http://localhost'
+        homeCom3.createdAt = new Date()
+        await DbCommunity.insert(homeCom3)
       })
 
-      it('returns three communities', async () => {
-        await expect(query({ query: communities })).resolves.toMatchObject({
+      it('returns three home-community entries', async () => {
+        await expect(query({ query: getCommunities })).resolves.toMatchObject({
           data: {
-            communities: [
+            getCommunities: [
               {
                 id: 1,
-                name: 'Gradido Entwicklung',
-                description: 'Die lokale Entwicklungsumgebung von Gradido.',
-                url: 'http://localhost/',
-                registerUrl: 'http://localhost/register-community',
+                foreign: homeCom1.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/1_0'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom1.createdAt.toISOString(),
+                updatedAt: null,
               },
               {
                 id: 2,
-                name: 'Gradido Staging',
-                description: 'Der Testserver der Gradido-Akademie.',
-                url: 'https://stage1.gradido.net/',
-                registerUrl: 'https://stage1.gradido.net/register-community',
+                foreign: homeCom2.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/1_1'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom2.createdAt.toISOString(),
+                updatedAt: null,
               },
               {
                 id: 3,
-                name: 'Gradido-Akademie',
-                description: 'Freies Institut für Wirtschaftsbionik.',
-                url: 'https://gradido.net',
-                registerUrl: 'https://gdd1.gradido.com/register-community',
+                foreign: homeCom3.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/2_0'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom3.createdAt.toISOString(),
+                updatedAt: null,
               },
             ],
           },
@@ -98,21 +118,104 @@ describe('CommunityResolver', () => {
       })
     })
 
-    describe('PRODUCTION = true', () => {
-      beforeEach(() => {
-        CONFIG.PRODUCTION = true
+    describe('plus foreign-communities entries', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+
+        foreignCom1 = DbCommunity.create()
+        foreignCom1.foreign = true
+        foreignCom1.publicKey = Buffer.from('publicKey-ForeignCommunity')
+        foreignCom1.apiVersion = '1_0'
+        foreignCom1.endPoint = 'http://remotehost'
+        foreignCom1.createdAt = new Date()
+        await DbCommunity.insert(foreignCom1)
+
+        foreignCom2 = DbCommunity.create()
+        foreignCom2.foreign = true
+        foreignCom2.publicKey = Buffer.from('publicKey-ForeignCommunity')
+        foreignCom2.apiVersion = '1_1'
+        foreignCom2.endPoint = 'http://remotehost'
+        foreignCom2.createdAt = new Date()
+        await DbCommunity.insert(foreignCom2)
+
+        foreignCom3 = DbCommunity.create()
+        foreignCom3.foreign = true
+        foreignCom3.publicKey = Buffer.from('publicKey-ForeignCommunity')
+        foreignCom3.apiVersion = '1_2'
+        foreignCom3.endPoint = 'http://remotehost'
+        foreignCom3.createdAt = new Date()
+        await DbCommunity.insert(foreignCom3)
       })
 
-      it('returns one community', async () => {
-        await expect(query({ query: communities })).resolves.toMatchObject({
+      it('returns 3x home and 3x foreign-community entries', async () => {
+        await expect(query({ query: getCommunities })).resolves.toMatchObject({
           data: {
-            communities: [
+            getCommunities: [
+              {
+                id: 1,
+                foreign: homeCom1.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/1_0'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom1.createdAt.toISOString(),
+                updatedAt: null,
+              },
+              {
+                id: 2,
+                foreign: homeCom2.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/1_1'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom2.createdAt.toISOString(),
+                updatedAt: null,
+              },
               {
                 id: 3,
-                name: 'Gradido-Akademie',
-                description: 'Freies Institut für Wirtschaftsbionik.',
-                url: 'https://gradido.net',
-                registerUrl: 'https://gdd1.gradido.com/register-community',
+                foreign: homeCom3.foreign,
+                publicKey: expect.stringMatching('publicKey-HomeCommunity'),
+                url: expect.stringMatching('http://localhost/api/2_0'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: homeCom3.createdAt.toISOString(),
+                updatedAt: null,
+              },
+              {
+                id: 4,
+                foreign: foreignCom1.foreign,
+                publicKey: expect.stringMatching('publicKey-ForeignCommunity'),
+                url: expect.stringMatching('http://remotehost/api/1_0'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: foreignCom1.createdAt.toISOString(),
+                updatedAt: null,
+              },
+              {
+                id: 5,
+                foreign: foreignCom2.foreign,
+                publicKey: expect.stringMatching('publicKey-ForeignCommunity'),
+                url: expect.stringMatching('http://remotehost/api/1_1'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: foreignCom2.createdAt.toISOString(),
+                updatedAt: null,
+              },
+              {
+                id: 6,
+                foreign: foreignCom3.foreign,
+                publicKey: expect.stringMatching('publicKey-ForeignCommunity'),
+                url: expect.stringMatching('http://remotehost/api/1_2'),
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: foreignCom3.createdAt.toISOString(),
+                updatedAt: null,
               },
             ],
           },
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index f56254e1f..1292fa55f 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -1,58 +1,18 @@
 import { Resolver, Query, Authorized } from 'type-graphql'
 
 import { Community } from '@model/Community'
+import { Community as DbCommunity } from '@entity/Community'
 
 import { RIGHTS } from '@/auth/RIGHTS'
-import CONFIG from '@/config'
 
 @Resolver()
 export class CommunityResolver {
-  @Authorized([RIGHTS.GET_COMMUNITY_INFO])
-  @Query(() => Community)
-  async getCommunityInfo(): Promise<Community> {
-    return new Community({
-      name: CONFIG.COMMUNITY_NAME,
-      description: CONFIG.COMMUNITY_DESCRIPTION,
-      url: CONFIG.COMMUNITY_URL,
-      registerUrl: CONFIG.COMMUNITY_REGISTER_URL,
-    })
-  }
-
   @Authorized([RIGHTS.COMMUNITIES])
   @Query(() => [Community])
-  async communities(): Promise<Community[]> {
-    if (CONFIG.PRODUCTION)
-      return [
-        new Community({
-          id: 3,
-          name: 'Gradido-Akademie',
-          description: 'Freies Institut für Wirtschaftsbionik.',
-          url: 'https://gradido.net',
-          registerUrl: 'https://gdd1.gradido.com/register-community',
-        }),
-      ]
-    return [
-      new Community({
-        id: 1,
-        name: 'Gradido Entwicklung',
-        description: 'Die lokale Entwicklungsumgebung von Gradido.',
-        url: 'http://localhost/',
-        registerUrl: 'http://localhost/register-community',
-      }),
-      new Community({
-        id: 2,
-        name: 'Gradido Staging',
-        description: 'Der Testserver der Gradido-Akademie.',
-        url: 'https://stage1.gradido.net/',
-        registerUrl: 'https://stage1.gradido.net/register-community',
-      }),
-      new Community({
-        id: 3,
-        name: 'Gradido-Akademie',
-        description: 'Freies Institut für Wirtschaftsbionik.',
-        url: 'https://gradido.net',
-        registerUrl: 'https://gdd1.gradido.com/register-community',
-      }),
-    ]
+  async getCommunities(): Promise<Community[]> {
+    const dbCommunities: DbCommunity[] = await DbCommunity.find({
+      order: { foreign: 'ASC', publicKey: 'ASC', apiVersion: 'ASC' },
+    })
+    return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom))
   }
 }
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 62f273829..4563d2a6a 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/unbound-method */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import Decimal from 'decimal.js-light'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 39f202848..cccf47399 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -35,7 +35,7 @@ export class ContributionLinkResolver {
       cycle,
       validFrom,
       validTo,
-      maxAmountPerMonth,
+      maxAmountPerMonth = null,
       maxPerCycle,
     }: ContributionLinkArgs,
   ): Promise<ContributionLink> {
@@ -114,7 +114,7 @@ export class ContributionLinkResolver {
       cycle,
       validFrom,
       validTo,
-      maxAmountPerMonth,
+      maxAmountPerMonth = null,
       maxPerCycle,
     }: ContributionLinkArgs,
     @Arg('id', () => Int) id: number,
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index f3e5e865d..8b5c5a0a7 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -181,7 +186,7 @@ describe('ContributionMessageResolver', () => {
           )
         })
 
-        it('calls sendAddedContributionMessageEmail', async () => {
+        it('calls sendAddedContributionMessageEmail', () => {
           expect(sendAddedContributionMessageEmail).toBeCalledWith({
             firstName: 'Bibi',
             lastName: 'Bloxberg',
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index adfcdf160..e9258490e 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -1,4 +1,5 @@
-import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql'
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
 
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
@@ -68,7 +69,7 @@ export class ContributionMessageResolver {
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
   @Query(() => ContributionMessageListResult)
   async listContributionMessages(
-    @Arg('contributionId') contributionId: number,
+    @Arg('contributionId', () => Int) contributionId: number,
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
   ): Promise<ContributionMessageListResult> {
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index a8e36258c..ae017b7e5 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -24,7 +29,11 @@ import {
   listContributions,
   adminListAllContributions,
 } from '@/seeds/graphql/queries'
-import { sendContributionConfirmedEmail } from '@/emails/sendEmailVariants'
+import {
+  sendContributionConfirmedEmail,
+  sendContributionDeletedEmail,
+  sendContributionDeniedEmail,
+} from '@/emails/sendEmailVariants'
 import {
   cleanDB,
   resetToken,
@@ -37,7 +46,7 @@ import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { EventProtocol } from '@entity/EventProtocol'
+import { Event as DbEvent } from '@entity/Event'
 import { Contribution } from '@entity/Contribution'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User } from '@entity/User'
@@ -50,21 +59,7 @@ import { ContributionListResult } from '@model/Contribution'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
 
-// mock account activation email to avoid console spam
-jest.mock('@/emails/sendEmailVariants', () => {
-  const originalModule = jest.requireActual('@/emails/sendEmailVariants')
-  return {
-    __esModule: true,
-    ...originalModule,
-    // TODO: test the call of …
-    // sendAccountActivationEmail: jest.fn((a) => originalModule.sendAccountActivationEmail(a)),
-    sendContributionConfirmedEmail: jest.fn((a) =>
-      originalModule.sendContributionConfirmedEmail(a),
-    ),
-    // TODO: test the call of …
-    // sendContributionRejectedEmail: jest.fn((a) => originalModule.sendContributionRejectedEmail(a)),
-  }
-})
+jest.mock('@/emails/sendEmailVariants')
 
 let mutate: any, query: any, con: any
 let testEnv: any
@@ -186,7 +181,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
@@ -275,7 +270,7 @@ describe('ContributionResolver', () => {
       })
 
       describe('valid input', () => {
-        it('creates contribution', async () => {
+        it('creates contribution', () => {
           expect(pendingContribution.data.createContribution).toMatchObject({
             id: expect.any(Number),
             amount: '100',
@@ -284,12 +279,13 @@ describe('ContributionResolver', () => {
         })
 
         it('stores the CONTRIBUTION_CREATE event in the database', async () => {
-          await expect(EventProtocol.find()).resolves.toContainEqual(
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.CONTRIBUTION_CREATE,
+              affectedUserId: bibi.id,
+              actingUserId: bibi.id,
+              involvedContributionId: pendingContribution.data.createContribution.id,
               amount: expect.decimalEqual(100),
-              contributionId: pendingContribution.data.createContribution.id,
-              userId: bibi.id,
             }),
           )
         })
@@ -321,7 +317,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
@@ -462,7 +458,7 @@ describe('ContributionResolver', () => {
               id: pendingContribution.data.createContribution.id,
             })
             contribution.contributionStatus = ContributionStatus.DELETED
-            contribution.save()
+            await contribution.save()
             await mutate({
               mutation: login,
               variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
@@ -474,7 +470,7 @@ describe('ContributionResolver', () => {
               id: pendingContribution.data.createContribution.id,
             })
             contribution.contributionStatus = ContributionStatus.PENDING
-            contribution.save()
+            await contribution.save()
           })
 
           it('throws an error', async () => {
@@ -589,12 +585,13 @@ describe('ContributionResolver', () => {
             variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
           })
 
-          await expect(EventProtocol.find()).resolves.toContainEqual(
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.CONTRIBUTION_UPDATE,
+              affectedUserId: bibi.id,
+              actingUserId: bibi.id,
+              involvedContributionId: pendingContribution.data.createContribution.id,
               amount: expect.decimalEqual(10),
-              contributionId: pendingContribution.data.createContribution.id,
-              userId: bibi.id,
             }),
           )
         })
@@ -646,7 +643,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
@@ -819,16 +816,28 @@ describe('ContributionResolver', () => {
         })
 
         it('stores the ADMIN_CONTRIBUTION_DENY event in the database', async () => {
-          await expect(EventProtocol.find()).resolves.toContainEqual(
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.ADMIN_CONTRIBUTION_DENY,
-              userId: bibi.id,
-              xUserId: admin.id,
-              contributionId: contributionToDeny.data.createContribution.id,
+              affectedUserId: bibi.id,
+              actingUserId: admin.id,
+              involvedContributionId: contributionToDeny.data.createContribution.id,
               amount: expect.decimalEqual(100),
             }),
           )
         })
+
+        it('calls sendContributionDeniedEmail', () => {
+          expect(sendContributionDeniedEmail).toBeCalledWith({
+            firstName: 'Bibi',
+            lastName: 'Bloxberg',
+            email: 'bibi@bloxberg.de',
+            language: 'de',
+            senderFirstName: 'Peter',
+            senderLastName: 'Lustig',
+            contributionMemo: 'Test contribution to deny',
+          })
+        })
       })
     })
   })
@@ -854,7 +863,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
@@ -935,12 +944,13 @@ describe('ContributionResolver', () => {
         })
 
         it('stores the CONTRIBUTION_DELETE event in the database', async () => {
-          await expect(EventProtocol.find()).resolves.toContainEqual(
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.CONTRIBUTION_DELETE,
-              contributionId: contributionToDelete.data.createContribution.id,
+              affectedUserId: bibi.id,
+              actingUserId: bibi.id,
+              involvedContributionId: contributionToDelete.data.createContribution.id,
               amount: expect.decimalEqual(100),
-              userId: bibi.id,
             }),
           )
         })
@@ -993,7 +1003,6 @@ describe('ContributionResolver', () => {
             currentPage: 1,
             pageSize: 25,
             order: 'DESC',
-            filterConfirmed: false,
           },
         })
         expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')])
@@ -1008,11 +1017,11 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
-      describe('filter confirmed is false', () => {
+      describe('no status filter', () => {
         it('returns creations', async () => {
           const {
             data: { listContributions: contributionListResult },
@@ -1064,7 +1073,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      describe('filter confirmed is true', () => {
+      describe('with status filter [PENDING, IN_PROGRESS, DENIED, DELETED]', () => {
         it('returns only unconfirmed creations', async () => {
           const {
             data: { listContributions: contributionListResult },
@@ -1074,7 +1083,7 @@ describe('ContributionResolver', () => {
               currentPage: 1,
               pageSize: 25,
               order: 'DESC',
-              filterConfirmed: true,
+              statusFilter: ['PENDING', 'IN_PROGRESS', 'DENIED', 'DELETED'],
             },
           })
           expect(contributionListResult).toMatchObject({
@@ -1139,7 +1148,7 @@ describe('ContributionResolver', () => {
         })
       })
 
-      afterAll(async () => {
+      afterAll(() => {
         resetToken()
       })
 
@@ -1719,7 +1728,7 @@ describe('ContributionResolver', () => {
           })
         })
 
-        afterAll(async () => {
+        afterAll(() => {
           resetToken()
         })
 
@@ -1797,7 +1806,7 @@ describe('ContributionResolver', () => {
           })
         })
 
-        afterAll(async () => {
+        afterAll(() => {
           resetToken()
         })
 
@@ -1912,7 +1921,7 @@ describe('ContributionResolver', () => {
           })
 
           describe('valid user to create for', () => {
-            beforeAll(async () => {
+            beforeAll(() => {
               variables.email = 'bibi@bloxberg.de'
               variables.creationDate = 'invalid-date'
             })
@@ -2018,17 +2027,18 @@ describe('ContributionResolver', () => {
                 ).resolves.toEqual(
                   expect.objectContaining({
                     data: {
-                      adminCreateContribution: [1000, 1000, 590],
+                      adminCreateContribution: ['1000', '1000', '590'],
                     },
                   }),
                 )
               })
 
               it('stores the ADMIN_CONTRIBUTION_CREATE event in the database', async () => {
-                await expect(EventProtocol.find()).resolves.toContainEqual(
+                await expect(DbEvent.find()).resolves.toContainEqual(
                   expect.objectContaining({
                     type: EventProtocolType.ADMIN_CONTRIBUTION_CREATE,
-                    userId: admin.id,
+                    affectedUserId: bibi.id,
+                    actingUserId: admin.id,
                     amount: expect.decimalEqual(200),
                   }),
                 )
@@ -2226,7 +2236,7 @@ describe('ContributionResolver', () => {
                 mutate({
                   mutation: adminUpdateContribution,
                   variables: {
-                    id: creation ? creation.id : -1,
+                    id: creation?.id,
                     email: 'peter@lustig.de',
                     amount: new Decimal(300),
                     memo: 'Danke Peter!',
@@ -2250,10 +2260,11 @@ describe('ContributionResolver', () => {
             })
 
             it('stores the ADMIN_CONTRIBUTION_UPDATE event in the database', async () => {
-              await expect(EventProtocol.find()).resolves.toContainEqual(
+              await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
                   type: EventProtocolType.ADMIN_CONTRIBUTION_UPDATE,
-                  userId: admin.id,
+                  affectedUserId: creation?.userId,
+                  actingUserId: admin.id,
                   amount: 300,
                 }),
               )
@@ -2267,7 +2278,7 @@ describe('ContributionResolver', () => {
                 mutate({
                   mutation: adminUpdateContribution,
                   variables: {
-                    id: creation ? creation.id : -1,
+                    id: creation?.id,
                     email: 'peter@lustig.de',
                     amount: new Decimal(200),
                     memo: 'Das war leider zu Viel!',
@@ -2291,10 +2302,11 @@ describe('ContributionResolver', () => {
             })
 
             it('stores the ADMIN_CONTRIBUTION_UPDATE event in the database', async () => {
-              await expect(EventProtocol.find()).resolves.toContainEqual(
+              await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
                   type: EventProtocolType.ADMIN_CONTRIBUTION_UPDATE,
-                  userId: admin.id,
+                  affectedUserId: creation?.userId,
+                  actingUserId: admin.id,
                   amount: expect.decimalEqual(200),
                 }),
               )
@@ -2365,7 +2377,7 @@ describe('ContributionResolver', () => {
                 mutate({
                   mutation: adminDeleteContribution,
                   variables: {
-                    id: creation ? creation.id : -1,
+                    id: creation?.id,
                   },
                 }),
               ).resolves.toEqual(
@@ -2376,14 +2388,28 @@ describe('ContributionResolver', () => {
             })
 
             it('stores the ADMIN_CONTRIBUTION_DELETE event in the database', async () => {
-              await expect(EventProtocol.find()).resolves.toContainEqual(
+              await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
                   type: EventProtocolType.ADMIN_CONTRIBUTION_DELETE,
-                  userId: admin.id,
+                  affectedUserId: creation?.userId,
+                  actingUserId: admin.id,
+                  involvedContributionId: creation?.id,
                   amount: expect.decimalEqual(200),
                 }),
               )
             })
+
+            it('calls sendContributionDeletedEmail', () => {
+              expect(sendContributionDeletedEmail).toBeCalledWith({
+                firstName: 'Peter',
+                lastName: 'Lustig',
+                email: 'peter@lustig.de',
+                language: 'de',
+                senderFirstName: 'Peter',
+                senderLastName: 'Lustig',
+                contributionMemo: 'Das war leider zu Viel!',
+              })
+            })
           })
 
           describe('creation already confirmed', () => {
@@ -2520,7 +2546,7 @@ describe('ContributionResolver', () => {
             })
 
             it('stores the CONTRIBUTION_CONFIRM event in the database', async () => {
-              await expect(EventProtocol.find()).resolves.toContainEqual(
+              await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
                   type: EventProtocolType.CONTRIBUTION_CONFIRM,
                 }),
@@ -2538,7 +2564,7 @@ describe('ContributionResolver', () => {
               expect(transaction[0].typeId).toEqual(1)
             })
 
-            it('calls sendContributionConfirmedEmail', async () => {
+            it('calls sendContributionConfirmedEmail', () => {
               expect(sendContributionConfirmedEmail).toBeCalledWith({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2552,7 +2578,7 @@ describe('ContributionResolver', () => {
             })
 
             it('stores the SEND_CONFIRMATION_EMAIL event in the database', async () => {
-              await expect(EventProtocol.find()).resolves.toContainEqual(
+              await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
                   type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
                 }),
@@ -2732,15 +2758,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'CONFIRMED',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(100),
-              firstName: 'Bob',
-              id: expect.any(Number),
-              lastName: 'der Baumeister',
-              memo: 'Confirmed Contribution',
-              messagesCount: 0,
-              state: 'CONFIRMED',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(400),
               firstName: 'Peter',
@@ -2750,6 +2767,15 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'PENDING',
             }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(100),
+              firstName: 'Bob',
+              id: expect.any(Number),
+              lastName: 'der Baumeister',
+              memo: 'Confirmed Contribution',
+              messagesCount: 0,
+              state: 'CONFIRMED',
+            }),
             expect.objectContaining({
               amount: expect.decimalEqual(100),
               firstName: 'Peter',
@@ -2768,15 +2794,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'PENDING',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(10),
-              firstName: 'Bibi',
-              id: expect.any(Number),
-              lastName: 'Bloxberg',
-              memo: 'Test PENDING contribution update',
-              messagesCount: 0,
-              state: 'PENDING',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(200),
               firstName: 'Peter',
@@ -2786,15 +2803,6 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'DELETED',
             }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(166),
-              firstName: 'Räuber',
-              id: expect.any(Number),
-              lastName: 'Hotzenplotz',
-              memo: 'Whatever contribution',
-              messagesCount: 0,
-              state: 'DELETED',
-            }),
             expect.objectContaining({
               amount: expect.decimalEqual(166),
               firstName: 'Räuber',
@@ -2804,6 +2812,15 @@ describe('ContributionResolver', () => {
               messagesCount: 0,
               state: 'DENIED',
             }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(166),
+              firstName: 'Räuber',
+              id: expect.any(Number),
+              lastName: 'Hotzenplotz',
+              memo: 'Whatever contribution',
+              messagesCount: 0,
+              state: 'DELETED',
+            }),
             expect.objectContaining({
               amount: expect.decimalEqual(166),
               firstName: 'Räuber',
@@ -2818,18 +2835,9 @@ describe('ContributionResolver', () => {
               firstName: 'Bibi',
               id: expect.any(Number),
               lastName: 'Bloxberg',
-              memo: 'Test IN_PROGRESS contribution',
+              memo: 'Test contribution to delete',
               messagesCount: 0,
-              state: 'IN_PROGRESS',
-            }),
-            expect.objectContaining({
-              amount: expect.decimalEqual(100),
-              firstName: 'Bibi',
-              id: expect.any(Number),
-              lastName: 'Bloxberg',
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-              state: 'CONFIRMED',
+              state: 'DELETED',
             }),
             expect.objectContaining({
               amount: expect.decimalEqual(100),
@@ -2845,9 +2853,27 @@ describe('ContributionResolver', () => {
               firstName: 'Bibi',
               id: expect.any(Number),
               lastName: 'Bloxberg',
-              memo: 'Test contribution to delete',
+              memo: 'Test contribution to confirm',
               messagesCount: 0,
-              state: 'DELETED',
+              state: 'CONFIRMED',
+            }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(100),
+              firstName: 'Bibi',
+              id: expect.any(Number),
+              lastName: 'Bloxberg',
+              memo: 'Test IN_PROGRESS contribution',
+              messagesCount: 1,
+              state: 'IN_PROGRESS',
+            }),
+            expect.objectContaining({
+              amount: expect.decimalEqual(10),
+              firstName: 'Bibi',
+              id: expect.any(Number),
+              lastName: 'Bloxberg',
+              memo: 'Test PENDING contribution update',
+              messagesCount: 1,
+              state: 'PENDING',
             }),
             expect.objectContaining({
               amount: expect.decimalEqual(1000),
@@ -2888,11 +2914,11 @@ describe('ContributionResolver', () => {
               state: 'PENDING',
             }),
             expect.objectContaining({
-              amount: '200',
-              firstName: 'Bibi',
+              amount: '100',
+              firstName: 'Peter',
               id: expect.any(Number),
-              lastName: 'Bloxberg',
-              memo: 'Aktives Grundeinkommen',
+              lastName: 'Lustig',
+              memo: 'Test env contribution',
               messagesCount: 0,
               state: 'PENDING',
             }),
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 9cb81ce4c..f0e8cbd14 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -1,6 +1,7 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import Decimal from 'decimal.js-light'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
-import { FindOperator, IsNull, getConnection } from '@dbTools/typeorm'
+import { IsNull, getConnection } from '@dbTools/typeorm'
 
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage } from '@entity/ContributionMessage'
@@ -27,11 +28,11 @@ import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
 import {
-  getCreationDates,
   getUserCreation,
   validateContribution,
   updateCreations,
   isValidDateString,
+  getOpenCreations,
 } from './util/creations'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import {
@@ -90,7 +91,7 @@ export class ContributionResolver {
     logger.trace('contribution to save', contribution)
     await DbContribution.save(contribution)
 
-    await EVENT_CONTRIBUTION_CREATE(user.id, contribution.id, amount)
+    await EVENT_CONTRIBUTION_CREATE(user, contribution, amount)
 
     return new UnconfirmedContribution(contribution, user, creations)
   }
@@ -118,7 +119,7 @@ export class ContributionResolver {
     contribution.deletedAt = new Date()
     await contribution.save()
 
-    await EVENT_CONTRIBUTION_DELETE(user.id, contribution.id, contribution.amount)
+    await EVENT_CONTRIBUTION_DELETE(user, contribution, contribution.amount)
 
     const res = await contribution.softRemove()
     return !!res
@@ -127,35 +128,26 @@ export class ContributionResolver {
   @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
   @Query(() => ContributionListResult)
   async listContributions(
+    @Ctx() context: Context,
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
-    @Arg('filterConfirmed', () => Boolean)
-    filterConfirmed: boolean | null,
-    @Ctx() context: Context,
+    @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
+    statusFilter?: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    const where: {
-      userId: number
-      confirmedBy?: FindOperator<number> | null
-    } = { userId: user.id }
-
-    if (filterConfirmed) where.confirmedBy = IsNull()
-
-    const [contributions, count] = await getConnection()
-      .createQueryBuilder()
-      .select('c')
-      .from(DbContribution, 'c')
-      .leftJoinAndSelect('c.messages', 'm')
-      .where(where)
-      .withDeleted()
-      .orderBy('c.createdAt', order)
-      .limit(pageSize)
-      .offset((currentPage - 1) * pageSize)
-      .getManyAndCount()
 
+    const [dbContributions, count] = await findContributions(
+      order,
+      currentPage,
+      pageSize,
+      true,
+      ['messages'],
+      user.id,
+      statusFilter,
+    )
     return new ContributionListResult(
       count,
-      contributions.map((contribution) => new Contribution(contribution, user)),
+      dbContributions.map((contribution) => new Contribution(contribution, user)),
     )
   }
 
@@ -165,13 +157,15 @@ export class ContributionResolver {
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
-    statusFilter?: ContributionStatus[],
+    statusFilter?: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await findContributions(
       order,
       currentPage,
       pageSize,
       false,
+      ['user'],
+      undefined,
       statusFilter,
     )
 
@@ -246,22 +240,22 @@ export class ContributionResolver {
     contributionMessage.isModerator = false
     contributionMessage.userId = user.id
     contributionMessage.type = ContributionMessageType.HISTORY
-    ContributionMessage.save(contributionMessage)
+    await ContributionMessage.save(contributionMessage)
 
     contributionToUpdate.amount = amount
     contributionToUpdate.memo = memo
     contributionToUpdate.contributionDate = new Date(creationDate)
     contributionToUpdate.contributionStatus = ContributionStatus.PENDING
     contributionToUpdate.updatedAt = new Date()
-    DbContribution.save(contributionToUpdate)
+    await DbContribution.save(contributionToUpdate)
 
-    await EVENT_CONTRIBUTION_UPDATE(user.id, contributionId, amount)
+    await EVENT_CONTRIBUTION_UPDATE(user, contributionToUpdate, amount)
 
     return new UnconfirmedContribution(contributionToUpdate, user, creations)
   }
 
   @Authorized([RIGHTS.ADMIN_CREATE_CONTRIBUTION])
-  @Mutation(() => [Number])
+  @Mutation(() => [Decimal])
   async adminCreateContribution(
     @Args() { email, amount, memo, creationDate }: AdminCreateContributionArgs,
     @Ctx() context: Context,
@@ -312,7 +306,7 @@ export class ContributionResolver {
 
     await DbContribution.save(contribution)
 
-    await EVENT_ADMIN_CONTRIBUTION_CREATE(moderator.id, contribution.id, amount)
+    await EVENT_ADMIN_CONTRIBUTION_CREATE(emailContact.user, moderator, contribution, amount)
 
     return getUserCreation(emailContact.userId, clientTimezoneOffset)
   }
@@ -380,7 +374,12 @@ export class ContributionResolver {
 
     result.creation = await getUserCreation(emailContact.user.id, clientTimezoneOffset)
 
-    await EVENT_ADMIN_CONTRIBUTION_UPDATE(emailContact.user.id, contributionToUpdate.id, amount)
+    await EVENT_ADMIN_CONTRIBUTION_UPDATE(
+      emailContact.user,
+      moderator,
+      contributionToUpdate,
+      amount,
+    )
 
     return result
   }
@@ -391,13 +390,15 @@ export class ContributionResolver {
     @Args()
     { currentPage = 1, pageSize = 3, order = Order.DESC }: Paginated,
     @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
-    statusFilter?: ContributionStatus[],
+    statusFilter?: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await findContributions(
       order,
       currentPage,
       pageSize,
       true,
+      ['user', 'messages'],
+      undefined,
       statusFilter,
     )
 
@@ -436,9 +437,14 @@ export class ContributionResolver {
     await contribution.save()
     const res = await contribution.softRemove()
 
-    await EVENT_ADMIN_CONTRIBUTION_DELETE(contribution.userId, contribution.id, contribution.amount)
+    await EVENT_ADMIN_CONTRIBUTION_DELETE(
+      { id: contribution.userId } as DbUser,
+      moderator,
+      contribution,
+      contribution.amount,
+    )
 
-    sendContributionDeletedEmail({
+    void sendContributionDeletedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.emailContact.email,
@@ -532,7 +538,7 @@ export class ContributionResolver {
 
         await queryRunner.commitTransaction()
         logger.info('creation commited successfuly.')
-        sendContributionConfirmedEmail({
+        void sendContributionConfirmedEmail({
           firstName: user.firstName,
           lastName: user.lastName,
           email: user.emailContact.email,
@@ -549,7 +555,7 @@ export class ContributionResolver {
         await queryRunner.release()
       }
 
-      await EVENT_CONTRIBUTION_CONFIRM(user.id, contribution.id, contribution.amount)
+      await EVENT_CONTRIBUTION_CONFIRM(user, moderatorUser, contribution, contribution.amount)
     } finally {
       releaseLock()
     }
@@ -585,21 +591,17 @@ export class ContributionResolver {
 
   @Authorized([RIGHTS.OPEN_CREATIONS])
   @Query(() => [OpenCreation])
-  async openCreations(
-    @Arg('userId', () => Int, { nullable: true }) userId: number | null,
+  async openCreations(@Ctx() context: Context): Promise<OpenCreation[]> {
+    return getOpenCreations(getUser(context).id, getClientTimezoneOffset(context))
+  }
+
+  @Authorized([RIGHTS.ADMIN_OPEN_CREATIONS])
+  @Query(() => [OpenCreation])
+  async adminOpenCreations(
+    @Arg('userId', () => Int) userId: number,
     @Ctx() context: Context,
   ): Promise<OpenCreation[]> {
-    const id = userId || getUser(context).id
-    const clientTimezoneOffset = getClientTimezoneOffset(context)
-    const creationDates = getCreationDates(clientTimezoneOffset)
-    const creations = await getUserCreation(id, clientTimezoneOffset)
-    return creationDates.map((date, index) => {
-      return {
-        month: date.getMonth(),
-        year: date.getFullYear(),
-        amount: creations[index],
-      }
-    })
+    return getOpenCreations(userId, getClientTimezoneOffset(context))
   }
 
   @Authorized([RIGHTS.DENY_CONTRIBUTION])
@@ -640,13 +642,13 @@ export class ContributionResolver {
     const res = await contributionToUpdate.save()
 
     await EVENT_ADMIN_CONTRIBUTION_DENY(
-      contributionToUpdate.userId,
-      moderator.id,
-      contributionToUpdate.id,
+      user,
+      moderator,
+      contributionToUpdate,
       contributionToUpdate.amount,
     )
 
-    sendContributionDeniedEmail({
+    void sendContributionDeniedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.emailContact.email,
diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
index 988595723..47fb3963c 100644
--- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts
+++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts
index 1745e7bbd..e12f92458 100644
--- a/backend/src/graphql/resolver/GdtResolver.ts
+++ b/backend/src/graphql/resolver/GdtResolver.ts
@@ -1,4 +1,7 @@
-import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql'
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
 
 import { GdtEntryList } from '@model/GdtEntryList'
 import { Order } from '@enum/Order'
@@ -23,6 +26,7 @@ export class GdtResolver {
 
     try {
       const resultGDT = await apiGet(
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.emailContact.email}/${currentPage}/${pageSize}/${order}`,
       )
       if (!resultGDT.success) {
@@ -35,7 +39,7 @@ export class GdtResolver {
   }
 
   @Authorized([RIGHTS.GDT_BALANCE])
-  @Query(() => Number)
+  @Query(() => Float, { nullable: true })
   async gdtBalance(@Ctx() context: Context): Promise<number | null> {
     const user = getUser(context)
     try {
@@ -54,9 +58,9 @@ export class GdtResolver {
   }
 
   @Authorized([RIGHTS.EXIST_PID])
-  @Query(() => Number)
+  @Query(() => Int)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async existPid(@Arg('pid') pid: number): Promise<number> {
+  async existPid(@Arg('pid', () => Int) pid: number): Promise<number> {
     // load user
     const resultPID = await apiGet(`${CONFIG.GDT_API_URL}/publishers/checkPidApi/${pid}`)
     if (!resultPID.success) {
diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index 4f88ccdc1..dd137f07c 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Resolver, Query, Authorized, Arg, Mutation, Args } from 'type-graphql'
 
 import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts
index e91840f10..38d0000cb 100644
--- a/backend/src/graphql/resolver/StatisticsResolver.ts
+++ b/backend/src/graphql/resolver/StatisticsResolver.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import Decimal from 'decimal.js-light'
 import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql'
 import { getConnection } from '@dbTools/typeorm'
@@ -15,7 +17,7 @@ import { calculateDecay } from '@/util/decay'
 export class StatisticsResolver {
   @Authorized([RIGHTS.COMMUNITY_STATISTICS])
   @Query(() => CommunityStatistics)
-  async communityStatistics(): Promise<CommunityStatistics> {
+  communityStatistics(): CommunityStatistics {
     return new CommunityStatistics()
   }
 
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index dda693b22..14c5b350b 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -17,10 +22,12 @@ import {
   createContribution,
   updateContribution,
   createTransactionLink,
+  confirmContribution,
 } from '@/seeds/graphql/mutations'
 import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { User } from '@entity/User'
+import { Transaction } from '@entity/Transaction'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import Decimal from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
@@ -137,6 +144,8 @@ describe('TransactionLinkResolver', () => {
       resetToken()
     })
 
+    let contributionId: number
+
     describe('unauthenticated', () => {
       it('throws an error', async () => {
         jest.clearAllMocks()
@@ -210,7 +219,7 @@ describe('TransactionLinkResolver', () => {
               mutate({
                 mutation: redeemTransactionLink,
                 variables: {
-                  code: 'CL-' + contributionLink.code,
+                  code: `CL-${contributionLink.code}`,
                 },
               }),
             ).resolves.toMatchObject({
@@ -249,7 +258,7 @@ describe('TransactionLinkResolver', () => {
               mutate({
                 mutation: redeemTransactionLink,
                 variables: {
-                  code: 'CL-' + contributionLink.code,
+                  code: `CL-${contributionLink.code}`,
                 },
               }),
             ).resolves.toMatchObject({
@@ -288,7 +297,7 @@ describe('TransactionLinkResolver', () => {
               mutate({
                 mutation: redeemTransactionLink,
                 variables: {
-                  code: 'CL-' + contributionLink.code,
+                  code: `CL-${contributionLink.code}`,
                 },
               }),
             ).resolves.toMatchObject({
@@ -306,7 +315,6 @@ describe('TransactionLinkResolver', () => {
           })
         })
 
-        // TODO: have this test separated into a transactionLink and a contributionLink part
         describe('redeem daily Contribution Link', () => {
           const now = new Date()
           let contributionLink: DbContributionLink | undefined
@@ -332,6 +340,10 @@ describe('TransactionLinkResolver', () => {
             })
           })
 
+          afterAll(async () => {
+            await resetEntity(Transaction)
+          })
+
           it('has a daily contribution link in the database', async () => {
             const cls = await DbContributionLink.find()
             expect(cls).toHaveLength(1)
@@ -373,6 +385,7 @@ describe('TransactionLinkResolver', () => {
                 },
               })
               contribution = result.data.createContribution
+              contributionId = result.data.createContribution.id
             })
 
             it('does not allow the user to redeem the contribution link', async () => {
@@ -508,6 +521,92 @@ describe('TransactionLinkResolver', () => {
           })
         })
       })
+
+      describe('transaction link', () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
+        })
+
+        describe('link does not exits', () => {
+          beforeAll(async () => {
+            await mutate({
+              mutation: login,
+              variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+            })
+          })
+
+          it('throws and logs the error', async () => {
+            await expect(
+              mutate({
+                mutation: redeemTransactionLink,
+                variables: {
+                  code: 'not-valid',
+                },
+              }),
+            ).resolves.toMatchObject({
+              errors: [new GraphQLError('Transaction link not found')],
+            })
+            expect(logger.error).toBeCalledWith('Transaction link not found', 'not-valid')
+          })
+        })
+
+        describe('link exists', () => {
+          let myCode: string
+
+          beforeAll(async () => {
+            await mutate({
+              mutation: login,
+              variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+            })
+            await mutate({
+              mutation: confirmContribution,
+              variables: { id: contributionId },
+            })
+            await mutate({
+              mutation: login,
+              variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+            })
+            const {
+              data: {
+                createTransactionLink: { code },
+              },
+            } = await mutate({
+              mutation: createTransactionLink,
+              variables: {
+                amount: 200,
+                memo: 'This is a transaction link from bibi',
+              },
+            })
+            myCode = code
+          })
+
+          describe('own link', () => {
+            beforeAll(async () => {
+              await mutate({
+                mutation: login,
+                variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+              })
+            })
+
+            it('throws and logs an error', async () => {
+              await expect(
+                mutate({
+                  mutation: redeemTransactionLink,
+                  variables: {
+                    code: myCode,
+                  },
+                }),
+              ).resolves.toMatchObject({
+                errors: [new GraphQLError('Cannot redeem own transaction link')],
+              })
+              expect(logger.error).toBeCalledWith(
+                'Cannot redeem own transaction link',
+                expect.any(Number),
+              )
+            })
+          })
+        })
+      })
     })
   })
 
@@ -600,6 +699,26 @@ describe('TransactionLinkResolver', () => {
           resetToken()
         })
 
+        describe('', () => {
+          it('throws error when user does not exists', async () => {
+            jest.clearAllMocks()
+            await expect(
+              mutate({
+                mutation: listTransactionLinksAdmin,
+                variables: {
+                  userId: -1,
+                },
+              }),
+            ).resolves.toMatchObject({
+              errors: [new GraphQLError('Could not find requested User')],
+            })
+          })
+
+          it('logs the error thrown', () => {
+            expect(logger.error).toBeCalledWith('Could not find requested User', -1)
+          })
+        })
+
         describe('without any filters', () => {
           it('finds 6 open transaction links and no deleted or redeemed', async () => {
             await expect(
@@ -611,8 +730,8 @@ describe('TransactionLinkResolver', () => {
               expect.objectContaining({
                 data: {
                   listTransactionLinksAdmin: {
-                    linkCount: 6,
-                    linkList: expect.not.arrayContaining([
+                    count: 6,
+                    links: expect.not.arrayContaining([
                       expect.objectContaining({
                         memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
                         createdAt: expect.any(String),
@@ -647,8 +766,8 @@ describe('TransactionLinkResolver', () => {
               expect.objectContaining({
                 data: {
                   listTransactionLinksAdmin: {
-                    linkCount: 6,
-                    linkList: expect.not.arrayContaining([
+                    count: 6,
+                    links: expect.not.arrayContaining([
                       expect.objectContaining({
                         memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
                         createdAt: expect.any(String),
@@ -681,8 +800,8 @@ describe('TransactionLinkResolver', () => {
               expect.objectContaining({
                 data: {
                   listTransactionLinksAdmin: {
-                    linkCount: 7,
-                    linkList: expect.arrayContaining([
+                    count: 7,
+                    links: expect.arrayContaining([
                       expect.not.objectContaining({
                         memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
                         createdAt: expect.any(String),
@@ -715,8 +834,8 @@ describe('TransactionLinkResolver', () => {
               expect.objectContaining({
                 data: {
                   listTransactionLinksAdmin: {
-                    linkCount: 7,
-                    linkList: expect.arrayContaining([
+                    count: 7,
+                    links: expect.arrayContaining([
                       expect.objectContaining({
                         memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
                         createdAt: expect.any(String),
@@ -752,8 +871,8 @@ describe('TransactionLinkResolver', () => {
               expect.objectContaining({
                 data: {
                   listTransactionLinksAdmin: {
-                    linkCount: 6,
-                    linkList: expect.arrayContaining([
+                    count: 6,
+                    links: expect.arrayContaining([
                       expect.not.objectContaining({
                         memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
                         createdAt: expect.any(String),
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 16766bdd6..9e365ab51 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -1,7 +1,7 @@
 import { randomBytes } from 'crypto'
 import Decimal from 'decimal.js-light'
 
-import { getConnection, MoreThan, FindOperator } from '@dbTools/typeorm'
+import { getConnection } from '@dbTools/typeorm'
 
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { User as DbUser } from '@entity/User'
@@ -13,7 +13,6 @@ import { User } from '@model/User'
 import { ContributionLink } from '@model/ContributionLink'
 import { Decay } from '@model/Decay'
 import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
-import { Order } from '@enum/Order'
 import { ContributionType } from '@enum/ContributionType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
@@ -35,6 +34,7 @@ import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
 
 import { getLastTransaction } from './util/getLastTransaction'
+import transactionLinkList from './util/transactionLinkList'
 
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
@@ -145,30 +145,6 @@ export class TransactionLinkResolver {
     }
   }
 
-  @Authorized([RIGHTS.LIST_TRANSACTION_LINKS])
-  @Query(() => [TransactionLink])
-  async listTransactionLinks(
-    @Args()
-    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
-    @Ctx() context: Context,
-  ): Promise<TransactionLink[]> {
-    const user = getUser(context)
-    // const now = new Date()
-    const transactionLinks = await DbTransactionLink.find({
-      where: {
-        userId: user.id,
-        redeemedBy: null,
-        // validUntil: MoreThan(now),
-      },
-      order: {
-        createdAt: order,
-      },
-      skip: (currentPage - 1) * pageSize,
-      take: pageSize,
-    })
-    return transactionLinks.map((tl) => new TransactionLink(tl, new User(user)))
-  }
-
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async redeemTransactionLink(
@@ -309,12 +285,20 @@ export class TransactionLinkResolver {
       return true
     } else {
       const now = new Date()
-      const transactionLink = await DbTransactionLink.findOneOrFail({ code })
-      const linkedUser = await DbUser.findOneOrFail(
+      const transactionLink = await DbTransactionLink.findOne({ code })
+      if (!transactionLink) {
+        throw new LogError('Transaction link not found', code)
+      }
+
+      const linkedUser = await DbUser.findOne(
         { id: transactionLink.userId },
         { relations: ['emailContact'] },
       )
 
+      if (!linkedUser) {
+        throw new LogError('Linked user not found for given link', transactionLink.userId)
+      }
+
       if (user.id === linkedUser.id) {
         throw new LogError('Cannot redeem own transaction link', user.id)
       }
@@ -342,43 +326,39 @@ export class TransactionLinkResolver {
     }
   }
 
+  @Authorized([RIGHTS.LIST_TRANSACTION_LINKS])
+  @Query(() => TransactionLinkResult)
+  async listTransactionLinks(
+    @Args()
+    paginated: Paginated,
+    @Ctx() context: Context,
+  ): Promise<TransactionLinkResult> {
+    return transactionLinkList(
+      paginated,
+      {
+        withDeleted: false,
+        withExpired: true,
+        withRedeemed: false,
+      },
+      getUser(context),
+    )
+  }
+
   @Authorized([RIGHTS.LIST_TRANSACTION_LINKS_ADMIN])
   @Query(() => TransactionLinkResult)
   async listTransactionLinksAdmin(
     @Args()
-    { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
+    paginated: Paginated,
+    // eslint-disable-next-line type-graphql/wrong-decorator-signature
     @Arg('filters', () => TransactionLinkFilters, { nullable: true })
-    filters: TransactionLinkFilters,
+    filters: TransactionLinkFilters | null, // eslint-disable-line type-graphql/invalid-nullable-input-type
     @Arg('userId', () => Int)
     userId: number,
   ): Promise<TransactionLinkResult> {
-    const user = await DbUser.findOneOrFail({ id: userId })
-    const where: {
-      userId: number
-      redeemedBy?: number | null
-      validUntil?: FindOperator<Date> | null
-    } = {
-      userId,
-      redeemedBy: null,
-      validUntil: MoreThan(new Date()),
-    }
-    if (filters) {
-      if (filters.withRedeemed) delete where.redeemedBy
-      if (filters.withExpired) delete where.validUntil
-    }
-    const [transactionLinks, count] = await DbTransactionLink.findAndCount({
-      where,
-      withDeleted: filters ? filters.withDeleted : false,
-      order: {
-        createdAt: order,
-      },
-      skip: (currentPage - 1) * pageSize,
-      take: pageSize,
-    })
-
-    return {
-      linkCount: count,
-      linkList: transactionLinks.map((tl) => new TransactionLink(tl, new User(user))),
+    const user = await DbUser.findOne({ id: userId })
+    if (!user) {
+      throw new LogError('Could not find requested User', userId)
     }
+    return transactionLinkList(paginated, filters, user)
   }
 }
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 6751aa6ad..6c1b4be7f 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -14,7 +18,7 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { garrickOllivander } from '@/seeds/users/garrick-ollivander'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
-import { EventProtocol } from '@entity/EventProtocol'
+import { Event as DbEvent } from '@entity/Event'
 import { Transaction } from '@entity/Transaction'
 import { User } from '@entity/User'
 import { cleanDB, testEnvironment } from '@test/helpers'
@@ -324,7 +328,7 @@ describe('send coins', () => {
         ).toEqual(
           expect.objectContaining({
             data: {
-              sendCoins: 'true',
+              sendCoins: true,
             },
           }),
         )
@@ -337,12 +341,13 @@ describe('send coins', () => {
           memo: 'unrepeatable memo',
         })
 
-        expect(EventProtocol.find()).resolves.toContainEqual(
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.TRANSACTION_SEND,
-            userId: user[1].id,
-            transactionId: transaction[0].id,
-            xUserId: user[0].id,
+            affectedUserId: user[1].id,
+            actingUserId: user[1].id,
+            involvedUserId: user[0].id,
+            involvedTransactionId: transaction[0].id,
           }),
         )
       })
@@ -354,12 +359,13 @@ describe('send coins', () => {
           memo: 'unrepeatable memo',
         })
 
-        expect(EventProtocol.find()).resolves.toContainEqual(
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.TRANSACTION_RECEIVE,
-            userId: user[0].id,
-            transactionId: transaction[0].id,
-            xUserId: user[1].id,
+            affectedUserId: user[0].id,
+            actingUserId: user[1].id,
+            involvedUserId: user[1].id,
+            involvedTransactionId: transaction[0].id,
           }),
         )
       })
@@ -379,7 +385,7 @@ describe('send coins', () => {
         ).resolves.toEqual(
           expect.objectContaining({
             data: {
-              sendCoins: 'true',
+              sendCoins: true,
             },
           }),
         )
@@ -395,7 +401,7 @@ describe('send coins', () => {
         ).resolves.toEqual(
           expect.objectContaining({
             data: {
-              sendCoins: 'true',
+              sendCoins: true,
             },
           }),
         )
@@ -411,7 +417,7 @@ describe('send coins', () => {
         ).resolves.toEqual(
           expect.objectContaining({
             data: {
-              sendCoins: 'true',
+              sendCoins: true,
             },
           }),
         )
@@ -427,7 +433,7 @@ describe('send coins', () => {
         ).resolves.toEqual(
           expect.objectContaining({
             data: {
-              sendCoins: 'true',
+              sendCoins: true,
             },
           }),
         )
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 9d5a1d38c..5b10c098f 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
@@ -137,17 +138,12 @@ export const executeTransaction = async (
       await queryRunner.commitTransaction()
       logger.info(`commit Transaction successful...`)
 
-      await EVENT_TRANSACTION_SEND(
-        transactionSend.userId,
-        transactionSend.linkedUserId,
-        transactionSend.id,
-        transactionSend.amount.mul(-1),
-      )
+      await EVENT_TRANSACTION_SEND(sender, recipient, transactionSend, transactionSend.amount)
 
       await EVENT_TRANSACTION_RECEIVE(
-        transactionReceive.userId,
-        transactionReceive.linkedUserId,
-        transactionReceive.id,
+        recipient,
+        sender,
+        transactionReceive,
         transactionReceive.amount,
       )
     } catch (e) {
@@ -304,7 +300,7 @@ export class TransactionResolver {
   }
 
   @Authorized([RIGHTS.SEND_COINS])
-  @Mutation(() => String)
+  @Mutation(() => Boolean)
   async sendCoins(
     @Args() { email, amount, memo }: TransactionSendArgs,
     @Ctx() context: Context,
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 19eb04b34..b91ed8709 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -35,7 +40,7 @@ import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
 import { ContributionLink } from '@model/ContributionLink'
 import { TransactionLink } from '@entity/TransactionLink'
 import { EventProtocolType } from '@/event/EventProtocolType'
-import { EventProtocol } from '@entity/EventProtocol'
+import { Event as DbEvent } from '@entity/Event'
 import { validate as validateUUID, version as versionUUID } from 'uuid'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { UserContact } from '@entity/UserContact'
@@ -182,10 +187,11 @@ describe('UserResolver', () => {
           { email: 'peter@lustig.de' },
           { relations: ['user'] },
         )
-        expect(EventProtocol.find()).resolves.toContainEqual(
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.REGISTER,
-            userId: userConatct.user.id,
+            affectedUserId: userConatct.user.id,
+            actingUserId: userConatct.user.id,
           }),
         )
       })
@@ -210,11 +216,12 @@ describe('UserResolver', () => {
         })
       })
 
-      it('stores the SEND_CONFIRMATION_EMAIL event in the database', () => {
-        expect(EventProtocol.find()).resolves.toContainEqual(
+      it('stores the SEND_CONFIRMATION_EMAIL event in the database', async () => {
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
-            userId: user[0].id,
+            affectedUserId: user[0].id,
+            actingUserId: user[0].id,
           }),
         )
       })
@@ -226,7 +233,7 @@ describe('UserResolver', () => {
         mutation = await mutate({ mutation: createUser, variables })
       })
 
-      it('logs an info', async () => {
+      it('logs an info', () => {
         expect(logger.info).toBeCalledWith('User already exists with this email=peter@lustig.de')
       })
 
@@ -239,7 +246,7 @@ describe('UserResolver', () => {
         })
       })
 
-      it('results with partly faked user with random "id"', async () => {
+      it('results with partly faked user with random "id"', () => {
         expect(mutation).toEqual(
           expect.objectContaining({
             data: {
@@ -256,10 +263,11 @@ describe('UserResolver', () => {
           { email: 'peter@lustig.de' },
           { relations: ['user'] },
         )
-        expect(EventProtocol.find()).resolves.toContainEqual(
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.SEND_ACCOUNT_MULTIREGISTRATION_EMAIL,
-            userId: userConatct.user.id,
+            affectedUserId: userConatct.user.id,
+            actingUserId: 0,
           }),
         )
       })
@@ -283,7 +291,7 @@ describe('UserResolver', () => {
     })
 
     describe('no publisher id', () => {
-      it('sets publisher id to null', async () => {
+      it('sets publisher id to 0', async () => {
         await mutate({
           mutation: createUser,
           variables: { ...variables, email: 'raeuber@hotzenplotz.de', publisherId: undefined },
@@ -294,7 +302,7 @@ describe('UserResolver', () => {
               emailContact: expect.objectContaining({
                 email: 'raeuber@hotzenplotz.de',
               }),
-              publisherId: null,
+              publisherId: 0,
             }),
           ]),
         )
@@ -355,21 +363,23 @@ describe('UserResolver', () => {
           )
         })
 
-        it('stores the ACTIVATE_ACCOUNT event in the database', () => {
-          expect(EventProtocol.find()).resolves.toContainEqual(
+        it('stores the ACTIVATE_ACCOUNT event in the database', async () => {
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.ACTIVATE_ACCOUNT,
-              userId: user[0].id,
+              affectedUserId: user[0].id,
+              actingUserId: user[0].id,
             }),
           )
         })
 
-        it('stores the REDEEM_REGISTER event in the database', () => {
-          expect(EventProtocol.find()).resolves.toContainEqual(
+        it('stores the REDEEM_REGISTER event in the database', async () => {
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.REDEEM_REGISTER,
-              userId: result.data.createUser.id,
-              contributionId: link.id,
+              affectedUserId: result.data.createUser.id,
+              actingUserId: result.data.createUser.id,
+              involvedContributionId: link.id,
             }),
           )
         })
@@ -449,10 +459,12 @@ describe('UserResolver', () => {
         })
 
         it('stores the REDEEM_REGISTER event in the database', async () => {
-          await expect(EventProtocol.find()).resolves.toContainEqual(
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.REDEEM_REGISTER,
-              userId: newUser.data.createUser.id,
+              affectedUserId: newUser.data.createUser.id,
+              actingUserId: newUser.data.createUser.id,
+              involvedTransactionId: transactionLink.id,
             }),
           )
         })
@@ -680,10 +692,11 @@ describe('UserResolver', () => {
           { email: 'bibi@bloxberg.de' },
           { relations: ['user'] },
         )
-        expect(EventProtocol.find()).resolves.toContainEqual(
+        await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
             type: EventProtocolType.LOGIN,
-            userId: userConatct.user.id,
+            affectedUserId: userConatct.user.id,
+            actingUserId: userConatct.user.id,
           }),
         )
       })
@@ -849,7 +862,7 @@ describe('UserResolver', () => {
       it('returns true', async () => {
         await expect(mutate({ mutation: logout })).resolves.toEqual(
           expect.objectContaining({
-            data: { logout: 'true' },
+            data: { logout: true },
             errors: undefined,
           }),
         )
@@ -927,11 +940,12 @@ describe('UserResolver', () => {
           )
         })
 
-        it('stores the LOGIN event in the database', () => {
-          expect(EventProtocol.find()).resolves.toContainEqual(
+        it('stores the LOGIN event in the database', async () => {
+          await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
               type: EventProtocolType.LOGIN,
-              userId: user[0].id,
+              affectedUserId: user[0].id,
+              actingUserId: user[0].id,
             }),
           )
         })
@@ -1847,10 +1861,11 @@ describe('UserResolver', () => {
               { email: 'bibi@bloxberg.de' },
               { relations: ['user'] },
             )
-            expect(EventProtocol.find()).resolves.toContainEqual(
+            await expect(DbEvent.find()).resolves.toContainEqual(
               expect.objectContaining({
                 type: EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL,
-                userId: userConatct.user.id,
+                affectedUserId: userConatct.user.id,
+                actingUserId: admin.id,
               }),
             )
           })
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index f9617b0df..b3bf1e4ee 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import i18n from 'i18n'
 import { v4 as uuidv4 } from 'uuid'
 import {
@@ -16,7 +20,9 @@ import { getConnection, getCustomRepository, IsNull, Not } from '@dbTools/typeor
 import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { Transaction as DbTransaction } from '@entity/Transaction'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { Contribution as DbContribution } from '@entity/Contribution'
 import { UserRepository } from '@repository/User'
 
 import { User } from '@model/User'
@@ -166,11 +172,11 @@ export class UserResolver {
 
     // Elopage Status & Stored PublisherId
     user.hasElopage = await this.hasElopage({ ...context, user: dbUser })
-    logger.info('user.hasElopage=' + user.hasElopage)
+    logger.info('user.hasElopage', user.hasElopage)
     if (!user.hasElopage && publisherId) {
       user.publisherId = publisherId
       dbUser.publisherId = publisherId
-      DbUser.save(dbUser)
+      await DbUser.save(dbUser)
     }
 
     context.setHeaders.push({
@@ -178,14 +184,14 @@ export class UserResolver {
       value: encode(dbUser.gradidoID),
     })
 
-    await EVENT_LOGIN(user.id)
+    await EVENT_LOGIN(dbUser)
     logger.info(`successful Login: ${JSON.stringify(user, null, 2)}`)
     return user
   }
 
   @Authorized([RIGHTS.LOGOUT])
-  @Mutation(() => String)
-  async logout(): Promise<boolean> {
+  @Mutation(() => Boolean)
+  logout(): boolean {
     // TODO: Event still missing here!!
     // TODO: We dont need this anymore, but might need this in the future in oder to invalidate a valid JWT-Token.
     // Furthermore this hook can be useful for tracking user behaviour (did he logout or not? Warn him if he didn't on next login)
@@ -202,7 +208,7 @@ export class UserResolver {
   @Mutation(() => User)
   async createUser(
     @Args()
-    { email, firstName, lastName, language, publisherId, redeemCode = null }: CreateUserArgs,
+    { email, firstName, lastName, language, publisherId = null, redeemCode = null }: CreateUserArgs,
   ): Promise<User> {
     logger.addContext('user', 'unknown')
     logger.info(
@@ -239,7 +245,7 @@ export class UserResolver {
         user.lastName = lastName
         user.language = language
         user.publisherId = publisherId
-        logger.debug('partly faked user=' + user)
+        logger.debug('partly faked user', user)
 
         const emailSent = await sendAccountMultiRegistrationEmail({
           firstName: foundUser.firstName, // this is the real name of the email owner, but just "firstName" would be the name of the new registrant which shall not be passed to the outside
@@ -248,7 +254,7 @@ export class UserResolver {
           language: foundUser.language, // use language of the emails owner for sending
         })
 
-        await EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL(foundUser.id)
+        await EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL(foundUser)
 
         logger.info(
           `sendAccountMultiRegistrationEmail by ${firstName} ${lastName} to ${foundUser.firstName} ${foundUser.lastName} <${email}>`,
@@ -266,31 +272,37 @@ export class UserResolver {
 
     const gradidoID = await newGradidoID()
 
-    const eventRegisterRedeem = Event(EventProtocolType.REDEEM_REGISTER, 0)
+    const eventRegisterRedeem = Event(
+      EventProtocolType.REDEEM_REGISTER,
+      { id: 0 } as DbUser,
+      { id: 0 } as DbUser,
+    )
     let dbUser = new DbUser()
     dbUser.gradidoID = gradidoID
     dbUser.firstName = firstName
     dbUser.lastName = lastName
     dbUser.language = language
-    dbUser.publisherId = publisherId
+    dbUser.publisherId = publisherId || 0
     dbUser.passwordEncryptionType = PasswordEncryptionType.NO_PASSWORD
-    logger.debug('new dbUser=' + dbUser)
+    logger.debug('new dbUser', dbUser)
     if (redeemCode) {
       if (redeemCode.match(/^CL-/)) {
         const contributionLink = await DbContributionLink.findOne({
           code: redeemCode.replace('CL-', ''),
         })
-        logger.info('redeemCode found contributionLink=' + contributionLink)
+        logger.info('redeemCode found contributionLink', contributionLink)
         if (contributionLink) {
           dbUser.contributionLinkId = contributionLink.id
-          eventRegisterRedeem.contributionId = contributionLink.id
+          // TODO this is so wrong
+          eventRegisterRedeem.involvedContribution = { id: contributionLink.id } as DbContribution
         }
       } else {
         const transactionLink = await DbTransactionLink.findOne({ code: redeemCode })
-        logger.info('redeemCode found transactionLink=' + transactionLink)
+        logger.info('redeemCode found transactionLink', transactionLink)
         if (transactionLink) {
           dbUser.referrerId = transactionLink.userId
-          eventRegisterRedeem.transactionId = transactionLink.id
+          // TODO this is so wrong
+          eventRegisterRedeem.involvedTransaction = { id: transactionLink.id } as DbTransaction
         }
       }
     }
@@ -329,7 +341,7 @@ export class UserResolver {
       })
       logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`)
 
-      await EVENT_SEND_CONFIRMATION_EMAIL(dbUser.id)
+      await EVENT_SEND_CONFIRMATION_EMAIL(dbUser)
 
       if (!emailSent) {
         logger.debug(`Account confirmation link: ${activationLink}`)
@@ -346,10 +358,11 @@ export class UserResolver {
     logger.info('createUser() successful...')
 
     if (redeemCode) {
-      eventRegisterRedeem.userId = dbUser.id
+      eventRegisterRedeem.affectedUser = dbUser
+      eventRegisterRedeem.actingUser = dbUser
       await eventRegisterRedeem.save()
     } else {
-      await EVENT_REGISTER(dbUser.id)
+      await EVENT_REGISTER(dbUser)
     }
 
     return new User(dbUser)
@@ -465,7 +478,7 @@ export class UserResolver {
       await queryRunner.commitTransaction()
       logger.info('User and UserContact data written successfully...')
 
-      await EVENT_ACTIVATE_ACCOUNT(user.id)
+      await EVENT_ACTIVATE_ACCOUNT(user)
     } catch (e) {
       await queryRunner.rollbackTransaction()
       throw new LogError('Error on writing User and User Contact data', e)
@@ -654,7 +667,7 @@ export class UserResolver {
         return 'user.' + fieldName
       }),
       searchText,
-      filters,
+      filters || null,
       currentPage,
       pageSize,
     )
@@ -775,9 +788,13 @@ export class UserResolver {
     return null
   }
 
+  // TODO this is an admin function - needs refactor
   @Authorized([RIGHTS.SEND_ACTIVATION_EMAIL])
   @Mutation(() => Boolean)
-  async sendActivationEmail(@Arg('email') email: string): Promise<boolean> {
+  async sendActivationEmail(
+    @Arg('email') email: string,
+    @Ctx() context: Context,
+  ): Promise<boolean> {
     email = email.trim().toLowerCase()
     // const user = await dbUser.findOne({ id: emailContact.userId })
     const user = await findUserByEmail(email)
@@ -802,7 +819,7 @@ export class UserResolver {
     if (!emailSent) {
       logger.info(`Account confirmation link: ${activationLink}`)
     } else {
-      await EVENT_ADMIN_SEND_CONFIRMATION_EMAIL(user.id)
+      await EVENT_ADMIN_SEND_CONFIRMATION_EMAIL(user, getUser(context))
     }
 
     return true
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index e334910f1..b3c99ba7d 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import Decimal from 'decimal.js-light'
@@ -79,7 +83,7 @@ describe('semaphore', () => {
         maxPerCycle: 1,
       },
     })
-    contributionLinkCode = 'CL-' + contributionLink.code
+    contributionLinkCode = `CL-${contributionLink.code}`
     await mutate({
       mutation: login,
       variables: { email: 'bob@baumeister.de', password: 'Aa12345_' },
@@ -187,4 +191,50 @@ describe('semaphore', () => {
     await expect(confirmBibisContribution).resolves.toMatchObject({ errors: undefined })
     await expect(confirmBobsContribution).resolves.toMatchObject({ errors: undefined })
   })
+
+  describe('redeem transaction link twice', () => {
+    let myCode: string
+
+    beforeAll(async () => {
+      await mutate({
+        mutation: login,
+        variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
+      })
+      const {
+        data: { createTransactionLink: bibisLink },
+      } = await mutate({
+        mutation: createTransactionLink,
+        variables: {
+          amount: 20,
+          memo: 'Bibis Link',
+        },
+      })
+      myCode = bibisLink.code
+      await mutate({
+        mutation: login,
+        variables: { email: 'bob@baumeister.de', password: 'Aa12345_' },
+      })
+    })
+
+    it('does not throw, but should', async () => {
+      const redeem1 = mutate({
+        mutation: redeemTransactionLink,
+        variables: {
+          code: myCode,
+        },
+      })
+      const redeem2 = mutate({
+        mutation: redeemTransactionLink,
+        variables: {
+          code: myCode,
+        },
+      })
+      await expect(redeem1).resolves.toMatchObject({
+        errors: undefined,
+      })
+      await expect(redeem2).resolves.toMatchObject({
+        errors: undefined,
+      })
+    })
+  })
 })
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 4d8132333..4eabec500 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index b9ba2e69f..a45703ed2 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -1,9 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 import { getConnection } from '@dbTools/typeorm'
 import { Contribution } from '@entity/Contribution'
 import Decimal from 'decimal.js-light'
 import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '../const/const'
+import { OpenCreation } from '@model/OpenCreation'
 
 interface CreationMap {
   id: number
@@ -100,7 +103,7 @@ const getCreationMonths = (timezoneOffset: number): number[] => {
   return getCreationDates(timezoneOffset).map((date) => date.getMonth() + 1)
 }
 
-export const getCreationDates = (timezoneOffset: number): Date[] => {
+const getCreationDates = (timezoneOffset: number): Date[] => {
   const clientNow = new Date()
   clientNow.setTime(clientNow.getTime() - timezoneOffset * 60 * 1000)
   logger.info(
@@ -152,3 +155,18 @@ export const updateCreations = (
 export const isValidDateString = (dateString: string): boolean => {
   return new Date(dateString).toString() !== 'Invalid Date'
 }
+
+export const getOpenCreations = async (
+  userId: number,
+  timezoneOffset: number,
+): Promise<OpenCreation[]> => {
+  const creations = await getUserCreation(userId, timezoneOffset)
+  const creationDates = getCreationDates(timezoneOffset)
+  return creationDates.map((date, index) => {
+    return {
+      month: date.getMonth(),
+      year: date.getFullYear(),
+      amount: creations[index],
+    }
+  })
+}
diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts
index 0dc70cf30..8957a29d8 100644
--- a/backend/src/graphql/resolver/util/findContributions.ts
+++ b/backend/src/graphql/resolver/util/findContributions.ts
@@ -8,17 +8,21 @@ export const findContributions = async (
   currentPage: number,
   pageSize: number,
   withDeleted: boolean,
-  statusFilter?: ContributionStatus[],
+  relations: string[],
+  userId?: number,
+  statusFilter?: ContributionStatus[] | null,
 ): Promise<[DbContribution[], number]> =>
   DbContribution.findAndCount({
     where: {
       ...(statusFilter && statusFilter.length && { contributionStatus: In(statusFilter) }),
+      ...(userId && { userId }),
     },
     withDeleted: withDeleted,
     order: {
       createdAt: order,
+      id: order,
     },
-    relations: ['user'],
+    relations,
     skip: (currentPage - 1) * pageSize,
     take: pageSize,
   })
diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts
new file mode 100644
index 000000000..2d151b94a
--- /dev/null
+++ b/backend/src/graphql/resolver/util/transactionLinkList.ts
@@ -0,0 +1,38 @@
+import { MoreThan } from '@dbTools/typeorm'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Order } from '@enum/Order'
+import Paginated from '@arg/Paginated'
+import TransactionLinkFilters from '@arg/TransactionLinkFilters'
+import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink'
+import { User } from '@/graphql/model/User'
+
+export default async function transactionLinkList(
+  { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
+  filters: TransactionLinkFilters | null,
+  user: DbUser,
+): Promise<TransactionLinkResult> {
+  const { withDeleted, withExpired, withRedeemed } = filters || {
+    withDeleted: false,
+    withExpired: false,
+    withRedeemed: false,
+  }
+  const [transactionLinks, count] = await DbTransactionLink.findAndCount({
+    where: {
+      userId: user.id,
+      ...(!withRedeemed && { redeemedBy: null }),
+      ...(!withExpired && { validUntil: MoreThan(new Date()) }),
+    },
+    withDeleted,
+    order: {
+      createdAt: order,
+    },
+    skip: (currentPage - 1) * pageSize,
+    take: pageSize,
+  })
+
+  return {
+    count,
+    links: transactionLinks.map((tl) => new TransactionLink(tl, new User(user))),
+  }
+}
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 10b7c91ac..cd6d002cc 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -17,7 +17,7 @@ async function main() {
       console.log(`GraphIQL available at http://localhost:${CONFIG.PORT}`)
     }
   })
-  startValidateCommunities(Number(CONFIG.FEDERATION_VALIDATE_COMMUNITY_TIMER))
+  void startValidateCommunities(Number(CONFIG.FEDERATION_VALIDATE_COMMUNITY_TIMER))
 }
 
 main().catch((e) => {
diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json
index 530e8db10..4dc90def2 100644
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@@ -17,7 +17,7 @@
     "addedContributionMessage": {
       "commonGoodContributionMessage": "du hast zu deinem Gemeinwohl-Beitrag „{contributionMemo}“ eine Nachricht von {senderFirstName} {senderLastName} erhalten.",
       "subject": "Gradido: Nachricht zu deinem Gemeinwohl-Beitrag",
-      "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
+      "toSeeAndAnswerMessage": "Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
     },
     "contributionConfirmed": {
       "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt und in deinem Gradido-Konto gutgeschrieben.",
@@ -26,12 +26,12 @@
     "contributionDeleted": {
       "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde gelöscht",
-      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
+      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
       "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde abgelehnt",
-      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
+      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“!"
     },
     "general": {
       "amountGDD": "Betrag: {amountGDD} GDD",
diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json
index 269c38629..74c5739bc 100644
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@@ -17,7 +17,7 @@
     "addedContributionMessage": {
       "commonGoodContributionMessage": "you have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.",
       "subject": "Gradido: Message about your common good contribution",
-      "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
+      "toSeeAndAnswerMessage": "To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
     },
     "contributionConfirmed": {
       "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
@@ -26,12 +26,12 @@
     "contributionDeleted": {
       "commonGoodContributionDeleted": "Your public good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was deleted",
-      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
+      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
     },
     "contributionDenied": {
       "commonGoodContributionDenied": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was rejected",
-      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
+      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab!"
     },
     "general": {
       "amountGDD": "Amount: {amountGDD} GDD",
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 6bdaa63fd..0469b4ccc 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { MiddlewareFn } from 'type-graphql'
 import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
 import { KlickTipp } from '@model/KlickTipp'
diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts
index d03f5d169..4c802a86f 100644
--- a/backend/src/password/EncryptorUtils.ts
+++ b/backend/src/password/EncryptorUtils.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import CONFIG from '@/config'
 import LogError from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts
index 08f784604..5925cdcfe 100644
--- a/backend/src/seeds/factory/contributionLink.ts
+++ b/backend/src/seeds/factory/contributionLink.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
 import { login, createContributionLink } from '@/seeds/graphql/mutations'
 import { ContributionLink } from '@model/ContributionLink'
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index 69d77aa03..db58c9d51 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts
index be5a01d22..797a93183 100644
--- a/backend/src/seeds/factory/transactionLink.ts
+++ b/backend/src/seeds/factory/transactionLink.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/unbound-method */
 import { ApolloServerTestClient } from 'apollo-server-testing'
 import { login, createTransactionLink } from '@/seeds/graphql/mutations'
 import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface'
diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index d566275db..854e5a4ed 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/unbound-method */
 import { createUser, setPassword } from '@/seeds/graphql/mutations'
 import { User } from '@entity/User'
 import { UserInterface } from '@/seeds/users/UserInterface'
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index 79684d378..1aa12a32f 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -89,6 +89,12 @@ export const createTransactionLink = gql`
   }
 `
 
+export const deleteTransactionLink = gql`
+  mutation ($id: Int!) {
+    deleteTransactionLink(id: $id)
+  }
+`
+
 // from admin interface
 
 export const adminCreateContribution = gql`
@@ -269,7 +275,7 @@ export const denyContribution = gql`
 `
 
 export const createContributionMessage = gql`
-  mutation ($contributionId: Float!, $message: String!) {
+  mutation ($contributionId: Int!, $message: String!) {
     createContributionMessage(contributionId: $contributionId, message: $message) {
       id
       message
@@ -283,7 +289,7 @@ export const createContributionMessage = gql`
 `
 
 export const adminCreateContributionMessage = gql`
-  mutation ($contributionId: Float!, $message: String!) {
+  mutation ($contributionId: Int!, $message: String!) {
     adminCreateContributionMessage(contributionId: $contributionId, message: $message) {
       id
       message
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index 71d305dbb..1d1cea823 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -133,6 +133,22 @@ export const communities = gql`
   }
 `
 
+export const getCommunities = gql`
+  query {
+    getCommunities {
+      id
+      foreign
+      publicKey
+      url
+      lastAnnouncedAt
+      verifiedAt
+      lastErrorAt
+      createdAt
+      updatedAt
+    }
+  }
+`
+
 export const queryTransactionLink = gql`
   query ($code: String!) {
     queryTransactionLink(code: $code) {
@@ -153,13 +169,13 @@ export const listContributions = gql`
     $currentPage: Int = 1
     $pageSize: Int = 5
     $order: Order
-    $filterConfirmed: Boolean = false
+    $statusFilter: [ContributionStatus!]
   ) {
     listContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
-      filterConfirmed: $filterConfirmed
+      statusFilter: $statusFilter
     ) {
       contributionCount
       contributionList {
@@ -250,8 +266,8 @@ export const listTransactionLinksAdmin = gql`
       currentPage: $currentPage
       pageSize: $pageSize
     ) {
-      linkCount
-      linkList {
+      count
+      links {
         id
         amount
         holdAvailableAmount
@@ -301,7 +317,7 @@ export const searchAdminUsers = gql`
 `
 
 export const listContributionMessages = gql`
-  query ($contributionId: Float!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
+  query ($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
     listContributionMessages(
       contributionId: $contributionId
       pageSize: $pageSize
diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index 9e1939db8..55cd65ec1 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
@@ -94,4 +98,4 @@ const run = async () => {
   await con.close()
 }
 
-run()
+void run()
diff --git a/backend/src/server/LogError.test.ts b/backend/src/server/LogError.test.ts
index 6654c42f3..5aa1cae21 100644
--- a/backend/src/server/LogError.test.ts
+++ b/backend/src/server/LogError.test.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
 import { logger } from '@test/testSetup'
 
 import LogError from './LogError'
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 390ff1c6b..0c5009b6f 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/unbound-method */
 import 'reflect-metadata'
 
 import { ApolloServer } from 'apollo-server-express'
@@ -71,6 +74,7 @@ const createServer = async (
   app.use(localization.init)
 
   // Elopage Webhook
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   app.post('/hook/elopage/' + CONFIG.WEBHOOK_ELOPAGE_SECRET, elopageWebhook)
 
   // Apollo Server
diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts
index 0cfa5689b..5cfa94285 100644
--- a/backend/src/server/logger.ts
+++ b/backend/src/server/logger.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import log4js from 'log4js'
 import CONFIG from '@/config'
 
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 7ecbedf2a..bc2495b71 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
diff --git a/backend/src/typeorm/repository/TransactionLink.ts b/backend/src/typeorm/repository/TransactionLink.ts
index 46926673a..7df1fd465 100644
--- a/backend/src/typeorm/repository/TransactionLink.ts
+++ b/backend/src/typeorm/repository/TransactionLink.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Repository, EntityRepository } from '@dbTools/typeorm'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import Decimal from 'decimal.js-light'
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 4972aa9c4..e72a6e717 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -7,7 +7,7 @@ export class UserRepository extends Repository<DbUser> {
   async findBySearchCriteriaPagedFiltered(
     select: string[],
     searchCriteria: string,
-    filters: SearchUsersFilters,
+    filters: SearchUsersFilters | null,
     currentPage: number,
     pageSize: number,
   ): Promise<[DbUser[], number]> {
diff --git a/backend/src/util/decay.test.ts b/backend/src/util/decay.test.ts
index f1111fab4..cf00ec851 100644
--- a/backend/src/util/decay.test.ts
+++ b/backend/src/util/decay.test.ts
@@ -10,13 +10,13 @@ describe('utils/decay', () => {
       // TODO: toString() was required, we could not compare two decimals
       expect(decayFormula(amount, seconds).toString()).toBe('0.999999978035040489732012')
     })
-    it('has correct backward calculation', async () => {
+    it('has correct backward calculation', () => {
       const amount = new Decimal(1.0)
       const seconds = -1
       expect(decayFormula(amount, seconds).toString()).toBe('1.000000021964959992727444')
     })
     // we get pretty close, but not exact here, skipping
-    it.skip('has correct forward calculation', async () => {
+    it.skip('has correct forward calculation', () => {
       const amount = new Decimal(1.0).div(
         new Decimal('0.99999997803504048973201202316767079413460520837376'),
       )
@@ -24,7 +24,7 @@ describe('utils/decay', () => {
       expect(decayFormula(amount, seconds).toString()).toBe('1.0')
     })
   })
-  it('has base 0.99999997802044727', async () => {
+  it('has base 0.99999997802044727', () => {
     const now = new Date()
     now.setSeconds(1)
     const oneSecondAgo = new Date(now.getTime())
@@ -34,7 +34,7 @@ describe('utils/decay', () => {
     )
   })
 
-  it('returns input amount when from and to is the same', async () => {
+  it('returns input amount when from and to is the same', () => {
     const now = new Date()
     expect(calculateDecay(new Decimal(100.0), now, now).balance.toString()).toBe('100')
   })
diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
index 02bdd853b..baa7970fc 100644
--- a/backend/src/util/klicktipp.ts
+++ b/backend/src/util/klicktipp.ts
@@ -26,4 +26,4 @@ export async function retrieveNotRegisteredEmails(): Promise<string[]> {
   return notRegisteredUser
 }
 
-retrieveNotRegisteredEmails()
+void retrieveNotRegisteredEmails()
diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts
index 87af4088c..587bb788c 100644
--- a/backend/src/webhook/elopage.ts
+++ b/backend/src/webhook/elopage.ts
@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /*
diff --git a/backend/test/extensions.ts b/backend/test/extensions.ts
index 69c2ff7a6..26fb11510 100644
--- a/backend/test/extensions.ts
+++ b/backend/test/extensions.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
 import Decimal from 'decimal.js-light'
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index 1935b01a0..a5f721717 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
diff --git a/backend/test/testSetup.ts b/backend/test/testSetup.ts
index 300a9cbf3..b13e3cf26 100644
--- a/backend/test/testSetup.ts
+++ b/backend/test/testSetup.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import CONFIG from '@/config'
 import { backendLogger as logger } from '@/server/logger'
 import { i18n } from '@/server/localization'
diff --git a/backend/yarn.lock b/backend/yarn.lock
index fe50e680c..3151557ab 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1014,6 +1014,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
+"@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1123,6 +1128,11 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+
 "@types/semver@^7.3.3":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"
@@ -1196,6 +1206,13 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
+"@typescript-eslint/experimental-utils@^5.9.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz#e249e3a47ace290ea3d83a5a08c8d90cd7fe2a53"
+  integrity sha512-4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw==
+  dependencies:
+    "@typescript-eslint/utils" "5.53.0"
+
 "@typescript-eslint/parser@^4.28.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
@@ -1214,11 +1231,24 @@
     "@typescript-eslint/types" "4.33.0"
     "@typescript-eslint/visitor-keys" "4.33.0"
 
+"@typescript-eslint/scope-manager@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz#42b54f280e33c82939275a42649701024f3fafef"
+  integrity sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==
+  dependencies:
+    "@typescript-eslint/types" "5.53.0"
+    "@typescript-eslint/visitor-keys" "5.53.0"
+
 "@typescript-eslint/types@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
   integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
 
+"@typescript-eslint/types@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
+  integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==
+
 "@typescript-eslint/typescript-estree@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
@@ -1232,6 +1262,33 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690"
+  integrity sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==
+  dependencies:
+    "@typescript-eslint/types" "5.53.0"
+    "@typescript-eslint/visitor-keys" "5.53.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.53.0.tgz#e55eaad9d6fffa120575ffaa530c7e802f13bce8"
+  integrity sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.53.0"
+    "@typescript-eslint/types" "5.53.0"
+    "@typescript-eslint/typescript-estree" "5.53.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+    semver "^7.3.7"
+
 "@typescript-eslint/visitor-keys@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
@@ -1240,6 +1297,14 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
+  integrity sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==
+  dependencies:
+    "@typescript-eslint/types" "5.53.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@wry/equality@^0.1.2":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790"
@@ -2673,6 +2738,13 @@ eslint-plugin-promise@^5.1.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24"
   integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==
 
+eslint-plugin-type-graphql@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-type-graphql/-/eslint-plugin-type-graphql-1.0.0.tgz#d348560ed628d6ca1dfcea35a02891432daafe6b"
+  integrity sha512-l6Yjcylavs88mcRZ3znwRuu8R9a8eoLdSaMGfycaMragf+VMxiz3kwjPmYz8AZxqqp8gvM7/2EGJqkkjM4NKIQ==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "^5.9.0"
+
 eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -2705,6 +2777,11 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
 eslint@^7.29.0:
   version "7.32.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
@@ -2916,6 +2993,17 @@ fast-glob@^3.1.1:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3197,6 +3285,18 @@ globby@^11.0.3:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -3505,6 +3605,11 @@ ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
+ignore@^5.2.0:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -3668,7 +3773,7 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4690,7 +4795,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
+merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -5760,6 +5865,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.3.7:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
diff --git a/database/entity/0060-update_communities_table/Community.ts b/database/entity/0060-update_communities_table/Community.ts
index 5ded76cf9..ab7cfb58a 100644
--- a/database/entity/0060-update_communities_table/Community.ts
+++ b/database/entity/0060-update_communities_table/Community.ts
@@ -25,13 +25,13 @@ export class Community extends BaseEntity {
   endPoint: string
 
   @Column({ name: 'last_announced_at', type: 'datetime', nullable: true })
-  lastAnnouncedAt: Date
+  lastAnnouncedAt: Date | null
 
   @Column({ name: 'verified_at', type: 'datetime', nullable: true })
-  verifiedAt: Date
+  verifiedAt: Date | null
 
   @Column({ name: 'last_error_at', type: 'datetime', nullable: true })
-  lastErrorAt: Date
+  lastErrorAt: Date | null
 
   @CreateDateColumn({
     name: 'created_at',
diff --git a/database/entity/0061-event_refactoring/Event.ts b/database/entity/0061-event_refactoring/Event.ts
new file mode 100644
index 000000000..ab75c2d94
--- /dev/null
+++ b/database/entity/0061-event_refactoring/Event.ts
@@ -0,0 +1,83 @@
+import { Contribution } from '../Contribution'
+import { ContributionMessage } from '../ContributionMessage'
+import { User } from '../User'
+import { Transaction } from '../Transaction'
+import Decimal from 'decimal.js-light'
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  ManyToOne,
+  JoinColumn,
+} from 'typeorm'
+import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
+
+@Entity('events')
+export class Event extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ length: 100, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  type: string
+
+  @CreateDateColumn({
+    name: 'created_at',
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP(3)',
+    nullable: false,
+  })
+  createdAt: Date
+
+  @Column({ name: 'affected_user_id', unsigned: true, nullable: false })
+  affectedUserId: number
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: 'affected_user_id', referencedColumnName: 'id' })
+  affectedUser: User
+
+  @Column({ name: 'acting_user_id', unsigned: true, nullable: false })
+  actingUserId: number
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: 'acting_user_id', referencedColumnName: 'id' })
+  actingUser: User
+
+  @Column({ name: 'involved_user_id', type: 'int', unsigned: true, nullable: true })
+  involvedUserId: number | null
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: 'involved_user_id', referencedColumnName: 'id' })
+  involvedUser: User | null
+
+  @Column({ name: 'involved_transaction_id', type: 'int', unsigned: true, nullable: true })
+  involvedTransactionId: number | null
+
+  @ManyToOne(() => Transaction)
+  @JoinColumn({ name: 'involved_transaction_id', referencedColumnName: 'id' })
+  involvedTransaction: Transaction | null
+
+  @Column({ name: 'involved_contribution_id', type: 'int', unsigned: true, nullable: true })
+  involvedContributionId: number | null
+
+  @ManyToOne(() => Contribution)
+  @JoinColumn({ name: 'involved_contribution_id', referencedColumnName: 'id' })
+  involvedContribution: Contribution | null
+
+  @Column({ name: 'involved_contribution_message_id', type: 'int', unsigned: true, nullable: true })
+  involvedContributionMessageId: number | null
+
+  @ManyToOne(() => ContributionMessage)
+  @JoinColumn({ name: 'involved_contribution_message_id', referencedColumnName: 'id' })
+  involvedContributionMessage: ContributionMessage | null
+
+  @Column({
+    type: 'decimal',
+    precision: 40,
+    scale: 20,
+    nullable: true,
+    transformer: DecimalTransformer,
+  })
+  amount: Decimal | null
+}
diff --git a/database/entity/Event.ts b/database/entity/Event.ts
new file mode 100644
index 000000000..e53085f2f
--- /dev/null
+++ b/database/entity/Event.ts
@@ -0,0 +1 @@
+export { Event } from './0061-event_refactoring/Event'
diff --git a/database/entity/EventProtocol.ts b/database/entity/EventProtocol.ts
deleted file mode 100644
index 6ebbd3d68..000000000
--- a/database/entity/EventProtocol.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { EventProtocol } from './0050-add_messageId_to_event_protocol/EventProtocol'
diff --git a/database/entity/index.ts b/database/entity/index.ts
index a58afb816..2d9d04c3b 100644
--- a/database/entity/index.ts
+++ b/database/entity/index.ts
@@ -7,21 +7,21 @@ import { TransactionLink } from './TransactionLink'
 import { User } from './User'
 import { UserContact } from './UserContact'
 import { Contribution } from './Contribution'
-import { EventProtocol } from './EventProtocol'
+import { Event } from './Event'
 import { ContributionMessage } from './ContributionMessage'
 import { Community } from './Community'
 
 export const entities = [
+  Community,
   Contribution,
   ContributionLink,
+  ContributionMessage,
+  Event,
   LoginElopageBuys,
   LoginEmailOptIn,
   Migration,
   Transaction,
   TransactionLink,
   User,
-  EventProtocol,
-  ContributionMessage,
   UserContact,
-  Community,
 ]
diff --git a/database/migrations/0060-update_communities_table.ts b/database/migrations/0060-update_communities_table.ts
index 79180e587..c1268850a 100644
--- a/database/migrations/0060-update_communities_table.ts
+++ b/database/migrations/0060-update_communities_table.ts
@@ -23,6 +23,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
 
 export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
   // write downgrade logic as parameter of queryFn
+  await queryFn('DELETE FROM `communities` WHERE `last_announced_at` IS NULL;')
   await queryFn(
     'ALTER TABLE `communities` MODIFY COLUMN `last_announced_at` datetime(3) NOT NULL AFTER `end_point`;',
   )
diff --git a/database/migrations/0061-event_refactoring.ts b/database/migrations/0061-event_refactoring.ts
new file mode 100644
index 000000000..019d3272b
--- /dev/null
+++ b/database/migrations/0061-event_refactoring.ts
@@ -0,0 +1,98 @@
+/* MIGRATION TO REFACTOR THE EVENT_PROTOCOL TABLE
+ *
+ * This migration refactors the `event_protocol` table.
+ * It renames the table to `event`, introduces new fields and renames others.
+ */
+
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn('RENAME TABLE `event_protocol` TO `events`;')
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `user_id` TO `affected_user_id`;')
+
+  await queryFn(
+    'ALTER TABLE `events` ADD COLUMN `acting_user_id` int(10) unsigned DEFAULT NULL AFTER `affected_user_id`;',
+  )
+  await queryFn('UPDATE `events` SET `acting_user_id` = `affected_user_id`;')
+  await queryFn(
+    'ALTER TABLE `events` MODIFY COLUMN `acting_user_id` int(10) unsigned NOT NULL AFTER `affected_user_id`;',
+  )
+
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `x_user_id` TO `involved_user_id`;')
+  await queryFn('ALTER TABLE `events` DROP COLUMN `x_community_id`;')
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `transaction_id` TO `involved_transaction_id`;')
+  await queryFn(
+    'ALTER TABLE `events` RENAME COLUMN `contribution_id` TO `involved_contribution_id`;',
+  )
+  await queryFn(
+    'ALTER TABLE `events` MODIFY COLUMN `message_id` int(10) unsigned DEFAULT NULL AFTER `involved_contribution_id`;',
+  )
+  await queryFn(
+    'ALTER TABLE `events` RENAME COLUMN `message_id` TO `involved_contribution_message_id`;',
+  )
+
+  // Moderator id was saved in former user_id
+  await queryFn(
+    'UPDATE `events` LEFT JOIN `contributions` ON events.involved_contribution_id = contributions.id SET affected_user_id=contributions.user_id WHERE `type` = "ADMIN_CONTRIBUTION_CREATE";',
+  )
+
+  // inconsistent data on this type, since not all data can be reconstructed
+  await queryFn(
+    'UPDATE `events` LEFT JOIN `contributions` ON events.involved_contribution_id = contributions.id SET acting_user_id=0 WHERE `type` = "ADMIN_CONTRIBUTION_UPDATE";',
+  )
+
+  await queryFn(
+    'UPDATE `events` LEFT JOIN `contributions` ON events.involved_contribution_id = contributions.id SET acting_user_id=contributions.deleted_by WHERE `type` = "ADMIN_CONTRIBUTION_DELETE";',
+  )
+
+  await queryFn(
+    'UPDATE `events` LEFT JOIN `contributions` ON events.involved_contribution_id = contributions.id SET acting_user_id=contributions.confirmed_by WHERE `type` = "CONTRIBUTION_CONFIRM";',
+  )
+
+  await queryFn(
+    'UPDATE `events` LEFT JOIN `contributions` ON events.involved_contribution_id = contributions.id SET involved_user_id=NULL, acting_user_id=contributions.denied_by WHERE `type` = "ADMIN_CONTRIBUTION_DENY";',
+  )
+
+  await queryFn(
+    'UPDATE `events` SET acting_user_id=involved_user_id WHERE `type` = "TRANSACTION_RECEIVE";',
+  )
+
+  await queryFn('UPDATE `events` SET amount = amount * -1 WHERE `type` = "TRANSACTION_SEND";')
+
+  await queryFn(
+    'ALTER TABLE `events` MODIFY COLUMN `created_at` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3);',
+  )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'ALTER TABLE `events` MODIFY COLUMN `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP();',
+  )
+
+  await queryFn('UPDATE `events` SET amount = amount * -1 WHERE `type` = "TRANSACTION_SEND";')
+
+  await queryFn(
+    'UPDATE `events` SET involved_user_id=acting_user_id WHERE `type` = "ADMIN_CONTRIBUTION_DENY";',
+  )
+  await queryFn(
+    'UPDATE `events` SET affected_user_id=acting_user_id WHERE `type` = "ADMIN_CONTRIBUTION_CREATE";',
+  )
+  await queryFn(
+    'ALTER TABLE `events` RENAME COLUMN `involved_contribution_message_id` TO `message_id`;',
+  )
+  await queryFn(
+    'ALTER TABLE `events` MODIFY COLUMN `message_id` int(10) unsigned DEFAULT NULL AFTER `amount`;',
+  )
+  await queryFn(
+    'ALTER TABLE `events` RENAME COLUMN `involved_contribution_id` TO `contribution_id`;',
+  )
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `involved_transaction_id` TO `transaction_id`;')
+  await queryFn(
+    'ALTER TABLE `events` ADD COLUMN `x_community_id` int(10) unsigned DEFAULT NULL AFTER `involved_user_id`;',
+  )
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `involved_user_id` TO `x_user_id`;')
+  await queryFn('ALTER TABLE `events` DROP COLUMN `acting_user_id`;')
+  await queryFn('ALTER TABLE `events` RENAME COLUMN `affected_user_id` TO `user_id`;')
+  await queryFn('RENAME TABLE `events` TO `event_protocol`;')
+}
diff --git a/database/package.json b/database/package.json
index 5be01a5d5..6dc8acf8c 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.18.2",
+  "version": "1.19.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
@@ -16,9 +16,7 @@
     "dev_up": "cross-env TZ=UTC ts-node src/index.ts up",
     "dev_down": "cross-env TZ=UTC ts-node src/index.ts down",
     "dev_reset": "cross-env TZ=UTC ts-node src/index.ts reset",
-    "lint": "eslint --max-warnings=0 --ext .js,.ts .",
-    "seed:config": "ts-node ./node_modules/typeorm-seeding/dist/cli.js config",
-    "seed": "cross-env TZ=UTC ts-node src/index.ts seed"
+    "lint": "eslint --max-warnings=0 --ext .js,.ts ."
   },
   "devDependencies": {
     "@types/faker": "^5.5.9",
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index b19bd8855..da745d705 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -65,7 +65,9 @@ FEDERATION_COMMUNITY_URL=http://stage1.gradido.net
 # the api port is the baseport, which will be added with the api-version, e.g. 1_0 = 5010
 FEDERATION_COMMUNITY_API_PORT=5000
 
-
+FEDERATION_CONFIG_VERSION=v1.2023-01-09
+# comma separated list of api-versions, which cause starting several federation modules
+FEDERATION_COMMUNITY_APIS=1_0,1_1,2_0
 
 # database
 DATABASE_CONFIG_VERSION=v1.2022-03-18
diff --git a/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template
new file mode 100644
index 000000000..2192b7dbb
--- /dev/null
+++ b/deployment/bare_metal/nginx/sites-available/gradido-federation.conf.template
@@ -0,0 +1,15 @@
+
+    location /api/$FEDERATION_APIVERSION {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:$FEDERATION_PORT;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.federation-$FEDERATION_PORT.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.federation-$FEDERATION_PORT.log warn;
+    }
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
index aade0429b..ddb0724b0 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -42,19 +42,19 @@ server {
 
     # Frontend (default)
     location / {
-		proxy_http_version 1.1;
-		proxy_set_header   Upgrade $http_upgrade;
-		proxy_set_header   Connection 'upgrade';
-		proxy_set_header   X-Forwarded-For $remote_addr;
-		proxy_set_header   X-Real-IP  $remote_addr;
-		proxy_set_header   Host $host;
-		
-		proxy_pass         http://127.0.0.1:3000;
-		proxy_redirect     off;
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:3000;
+        proxy_redirect     off;
 
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
-	}
+  }
 
     # Backend
     location /graphql {
@@ -112,6 +112,9 @@ server {
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
     }
     
+    # Federation
+    $FEDERATION_NGINX_CONF
+
     # TODO this could be a performance optimization
     #location /vue {
     #    alias /var/www/html/gradido/frontend/dist;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index b4c7b3463..42a5a1851 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -27,19 +27,19 @@ server {
 
     # Frontend (default)
     location / {
-		proxy_http_version 1.1;
-		proxy_set_header   Upgrade $http_upgrade;
-		proxy_set_header   Connection 'upgrade';
-		proxy_set_header   X-Forwarded-For $remote_addr;
-		proxy_set_header   X-Real-IP  $remote_addr;
-		proxy_set_header   Host $host;
-		
-		proxy_pass         http://127.0.0.1:3000;
-		proxy_redirect     off;
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:3000;
+        proxy_redirect     off;
 
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
-	}
+  }
 
     # Backend
     location /graphql {
@@ -98,6 +98,9 @@ server {
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
     }
 
+    # Federation
+    $FEDERATION_NGINX_CONF
+
     # TODO this could be a performance optimization
     #location /vue {
     #    alias /var/www/html/gradido/frontend/dist;
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 89dc9d2f0..6c3c07766 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -59,8 +59,9 @@ ln -s /etc/nginx/sites-available/update-page.conf /etc/nginx/sites-enabled/
 sudo /etc/init.d/nginx restart
 
 # stop all services
-echo 'Stopping all Gradido services' >> $UPDATE_HTML
-pm2 stop all
+echo 'Stop and delete all Gradido services' >> $UPDATE_HTML
+pm2 delete all
+pm2 save
 
 # git
 BRANCH=${1:-master}
@@ -73,12 +74,41 @@ git pull
 export BUILD_COMMIT="$(git rev-parse HEAD)"
 
 # Generate gradido.conf from template
+# *** 1st prepare for each apiversion the federation conf for nginx from federation-template
+# *** set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS and create gradido-federation.conf file
+rm -f $NGINX_CONFIG_DIR/gradido.conf.tmp
+rm -f $NGINX_CONFIG_DIR/gradido-federation.conf.locations
+echo "====================================================================================================" >> $UPDATE_HTML
+IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS
+for api in "${API_ARRAY[@]}"
+do
+  export FEDERATION_APIVERSION=$api
+  # calculate port by remove '_' and add value of api to baseport
+  port=${api//_/}
+  FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000}
+  FEDERATION_PORT=$(($FEDERATION_PORT + $port))
+  export FEDERATION_PORT
+  echo "create ngingx config: location /api/$FEDERATION_APIVERSION  to  http://127.0.0.1:$FEDERATION_PORT" >> $UPDATE_HTML
+  envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf.locations
+done
+unset FEDERATION_APIVERSION
+unset FEDERATION_PORT
+echo "====================================================================================================" >> $UPDATE_HTML
+
+# *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step
+export FEDERATION_NGINX_CONF=$(< $NGINX_CONFIG_DIR/gradido-federation.conf.locations)
+
+# *** 3rd generate gradido nginx config including federation modules per api-version
 echo 'Generate new gradido nginx config' >> $UPDATE_HTML
 case "$NGINX_SSL" in
  true) TEMPLATE_FILE="gradido.conf.ssl.template" ;;
     *) TEMPLATE_FILE="gradido.conf.template" ;;
 esac
-envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf
+envsubst '$FEDERATION_NGINX_CONF' < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf.tmp
+unset FEDERATION_NGINX_CONF
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido.conf.tmp > $NGINX_CONFIG_DIR/gradido.conf
+rm $NGINX_CONFIG_DIR/gradido.conf.tmp
+rm $NGINX_CONFIG_DIR/gradido-federation.conf.locations
 
 # Generate update-page.conf from template
 echo 'Generate new update-page nginx config' >> $UPDATE_HTML
@@ -94,11 +124,13 @@ cp -f $PROJECT_ROOT/backend/.env $PROJECT_ROOT/backend/.env.bak
 cp -f $PROJECT_ROOT/frontend/.env $PROJECT_ROOT/frontend/.env.bak
 cp -f $PROJECT_ROOT/admin/.env $PROJECT_ROOT/admin/.env.bak
 cp -f $PROJECT_ROOT/dht-node/.env $PROJECT_ROOT/dht-node/.env.bak
+cp -f $PROJECT_ROOT/federation/.env $PROJECT_ROOT/federation/.env.bak
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/database/.env.template > $PROJECT_ROOT/database/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/backend/.env.template > $PROJECT_ROOT/backend/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env.template > $PROJECT_ROOT/frontend/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env.template > $PROJECT_ROOT/dht-node/.env
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/federation/.env.template > $PROJECT_ROOT/federation/.env
 
 # Install & build database
 echo 'Updating database' >> $UPDATE_HTML
@@ -124,7 +156,6 @@ if [ "$DEPLOY_SEED_DATA" = "true" ]; then
 fi
 # TODO maybe handle this differently?
 export NODE_ENV=production
-pm2 delete gradido-backend
 pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 
@@ -137,7 +168,6 @@ yarn install
 yarn build
 # TODO maybe handle this differently?
 export NODE_ENV=production
-pm2 delete gradido-frontend
 pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 
@@ -150,7 +180,6 @@ yarn install
 yarn build
 # TODO maybe handle this differently?
 export NODE_ENV=production
-pm2 delete gradido-admin
 pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 
@@ -163,15 +192,49 @@ yarn install
 yarn build
 # TODO maybe handle this differently?
 export NODE_ENV=production
-pm2 delete gradido-dht-node
 if [ ! -z $FEDERATION_DHT_TOPIC ]; then
   pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 save
 else
-  echo "====================================================================="
-  echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..."  
-  echo "====================================================================="
+  echo "=====================================================================" >> $UPDATE_HTML
+  echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..."  >> $UPDATE_HTML
+  echo "=====================================================================" >> $UPDATE_HTML
 fi  
-pm2 save
+
+
+# Install & build federation
+echo 'Updating federation' >> $UPDATE_HTML
+cd $PROJECT_ROOT/federation
+# TODO maybe handle this differently?
+unset NODE_ENV
+yarn install
+yarn build
+# TODO maybe handle this differently?
+export NODE_ENV=production
+
+# set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS
+IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS
+for api in "${API_ARRAY[@]}"
+do
+  export FEDERATION_API=$api
+  echo "FEDERATION_API=$FEDERATION_API" >> $UPDATE_HTML
+  export MODULENAME=gradido-federation-$api
+  echo "MODULENAME=$MODULENAME" >> $UPDATE_HTML
+  # calculate port by remove '_' and add value of api to baseport
+  port=${api//_/}
+  FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000}
+  FEDERATION_PORT=$(($FEDERATION_PORT + $port))
+  export FEDERATION_PORT
+  echo "====================================================" >> $UPDATE_HTML
+  echo " start $MODULENAME listening on port=$FEDERATION_PORT" >> $UPDATE_HTML
+  echo "====================================================" >> $UPDATE_HTML
+#  pm2 delete $MODULENAME
+  pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 save
+done
+
+
+
 
 # let nginx showing gradido
 echo 'Configuring nginx to serve gradido again' >> $UPDATE_HTML
diff --git a/dht-node/jest.config.js b/dht-node/jest.config.js
index 10c87bddb..fa00ed868 100644
--- a/dht-node/jest.config.js
+++ b/dht-node/jest.config.js
@@ -4,6 +4,11 @@ module.exports = {
   preset: 'ts-jest',
   collectCoverage: true,
   collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
+  coverageThreshold: {
+    global: {
+      lines: 80,
+    },
+  },
   setupFiles: ['<rootDir>/test/testSetup.ts'],
   setupFilesAfterEnv: [],
   modulePathIgnorePatterns: ['<rootDir>/build/'],
diff --git a/dht-node/package.json b/dht-node/package.json
index ac9b88968..15426e606 100644
--- a/dht-node/package.json
+++ b/dht-node/package.json
@@ -13,7 +13,7 @@
     "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r dotenv/config -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
-    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles"
+    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles"
   },
   "dependencies": {
     "@hyperswarm/dht": "^6.4.4",
diff --git a/dht-node/src/config/index.ts b/dht-node/src/config/index.ts
index 8210ddfcc..6ba9493ac 100644
--- a/dht-node/src/config/index.ts
+++ b/dht-node/src/config/index.ts
@@ -3,7 +3,7 @@ import dotenv from 'dotenv'
 dotenv.config()
 
 const constants = {
-  DB_VERSION: '0060-update_communities_table',
+  DB_VERSION: '0061-event_refactoring',
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
diff --git a/dht-node/src/dht_node/index.test.ts b/dht-node/src/dht_node/index.test.ts
index b7e36c783..ac5b1b21a 100644
--- a/dht-node/src/dht_node/index.test.ts
+++ b/dht-node/src/dht_node/index.test.ts
@@ -719,11 +719,11 @@ describe('federation', () => {
                     JSON.stringify([
                       {
                         api: '1_0',
-                        url: 'http://localhost:5001/api/',
+                        url: 'http://localhost/api/',
                       },
                       {
                         api: '2_0',
-                        url: 'http://localhost:5002/api/',
+                        url: 'http://localhost/api/',
                       },
                     ]),
                   ),
@@ -747,7 +747,7 @@ describe('federation', () => {
                       foreign: true,
                       publicKey: expect.any(Buffer),
                       apiVersion: '1_0',
-                      endPoint: 'http://localhost:5001/api/',
+                      endPoint: 'http://localhost/api/',
                       lastAnnouncedAt: expect.any(Date),
                       createdAt: expect.any(Date),
                       updatedAt: null,
@@ -764,7 +764,7 @@ describe('federation', () => {
                       foreign: true,
                       publicKey: expect.any(Buffer),
                       apiVersion: '2_0',
-                      endPoint: 'http://localhost:5002/api/',
+                      endPoint: 'http://localhost/api/',
                       lastAnnouncedAt: expect.any(Date),
                       createdAt: expect.any(Date),
                       updatedAt: null,
@@ -786,15 +786,15 @@ describe('federation', () => {
                   JSON.stringify([
                     {
                       api: '1_0',
-                      url: 'http://localhost:5001/api/',
+                      url: 'http://localhost/api/',
                     },
                     {
                       api: '1_1',
-                      url: 'http://localhost:5002/api/',
+                      url: 'http://localhost/api/',
                     },
                     {
                       api: '2_0',
-                      url: 'http://localhost:5003/api/',
+                      url: 'http://localhost/api/',
                     },
                   ]),
                 ),
diff --git a/dht-node/src/dht_node/index.ts b/dht-node/src/dht_node/index.ts
index 722a62af7..d101037ae 100644
--- a/dht-node/src/dht_node/index.ts
+++ b/dht-node/src/dht_node/index.ts
@@ -181,11 +181,9 @@ export const startDHT = async (topic: string): Promise<void> => {
 
 async function writeHomeCommunityEnries(pubKey: any): Promise<CommunityApi[]> {
   const homeApiVersions: CommunityApi[] = Object.values(ApiVersionType).map(function (apiEnum) {
-    const port =
-      Number.parseInt(CONFIG.FEDERATION_COMMUNITY_API_PORT) + Number(apiEnum.replace('_', ''))
     const comApi: CommunityApi = {
       api: apiEnum,
-      url: CONFIG.FEDERATION_COMMUNITY_URL + ':' + port.toString() + '/api/',
+      url: CONFIG.FEDERATION_COMMUNITY_URL + '/api/',
     }
     return comApi
   })
diff --git a/e2e-tests/cypress.config.ts b/e2e-tests/cypress.config.ts
index 16ebb0e97..7205ef9cb 100644
--- a/e2e-tests/cypress.config.ts
+++ b/e2e-tests/cypress.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from 'cypress'
 import { addCucumberPreprocessorPlugin } from '@badeball/cypress-cucumber-preprocessor'
 import browserify from '@badeball/cypress-cucumber-preprocessor/browserify'
 
-let resetPasswordLink: string
+let emailLink: string
 
 async function setupNodeEvents(
   on: Cypress.PluginEvents,
@@ -18,11 +18,11 @@ async function setupNodeEvents(
   )
 
   on('task', {
-    setResetPasswordLink: (val) => {
-      return (resetPasswordLink = val)
+    setEmailLink: (link: string) => {
+      return (emailLink = link)
     },
-    getResetPasswordLink: () => {
-      return resetPasswordLink
+    getEmailLink: () => {
+      return emailLink
     },
   })
 
@@ -56,7 +56,7 @@ export default defineConfig({
     env: {
       backendURL: 'http://localhost:4000',
       mailserverURL: 'http://localhost:1080',
-      loginQuery: `query ($email: String!, $password: String!, $publisherId: Int) {
+      loginQuery: `mutation ($email: String!, $password: String!, $publisherId: Int) {
         login(email: $email, password: $password, publisherId: $publisherId) {
           email
           firstName
@@ -69,7 +69,8 @@ export default defineConfig({
           hasElopage
           publisherId
           isAdmin
-          creation
+          hideAmountGDD
+          hideAmountGDT
           __typename
         }
       }`,
diff --git a/e2e-tests/cypress/e2e/User.Authentication.ResetPassword.feature b/e2e-tests/cypress/e2e/User.Authentication.ResetPassword.feature
index 55ca87215..50a29d320 100644
--- a/e2e-tests/cypress/e2e/User.Authentication.ResetPassword.feature
+++ b/e2e-tests/cypress/e2e/User.Authentication.ResetPassword.feature
@@ -5,21 +5,21 @@ Feature: User Authentication - reset password
   # TODO for these pre-conditions utilize seeding or API check, if user exists in test system
   # Background:
   #   Given the following "users" are in the database:
-  #     | email            | password | name          |
-  #     | bibi@bloxberg.de | Aa12345_ | Bibi Bloxberg |
+  #     | email                  | password | name          |
+  #     | raeuber@hotzenplotz.de | Aa12345_ | Räuber Hotzenplotz |
 
   Scenario: Reset password from signin page successfully
     Given the user navigates to page "/login"
     And the user navigates to the forgot password page
-    When the user enters the e-mail address "bibi@bloxberg.de"
+    When the user enters the e-mail address "raeuber@hotzenplotz.de"
     And the user submits the e-mail form
-    Then the user receives an e-mail containing the password reset link
-    When the user opens the password reset link in the browser
+    Then the user receives an e-mail containing the "password reset" link
+    When the user opens the "password reset" link in the browser
     And the user enters the password "12345Aa_"
     And the user repeats the password "12345Aa_"
     And the user submits the password form
     And the user clicks the sign in button
-    Then the user submits the credentials "bibi@bloxberg.de" "Aa12345_"
+    Then the user submits the credentials "raeuber@hotzenplotz.de" "Aa12345_"
     And the user cannot login
-    But the user submits the credentials "bibi@bloxberg.de" "12345Aa_"
-    And the user is logged in with username "Bibi Bloxberg"
+    But the user submits the credentials "raeuber@hotzenplotz.de" "12345Aa_"
+    And the user is logged in with username "Räuber Hotzenplotz"
diff --git a/e2e-tests/cypress/e2e/User.Registration.feature b/e2e-tests/cypress/e2e/User.Registration.feature
index ed53bb4b0..a50d57ea2 100644
--- a/e2e-tests/cypress/e2e/User.Registration.feature
+++ b/e2e-tests/cypress/e2e/User.Registration.feature
@@ -2,12 +2,16 @@ Feature: User registration
   As a user
   I want to register to create an account
 
-  @skip
   Scenario: Register successfully
     Given the user navigates to page "/register"
     When the user fills name and email "Regina" "Register" "regina@register.com"
     And the user agrees to the privacy policy
     And the user submits the registration form
-    Then the user can use a provided activation link
-    And the user can set a password "Aa12345_"
-    And the user can login with the credentials "regina@register.com" "Aa12345_"
+    Then the user receives an e-mail containing the "activation" link
+    When the user opens the "activation" link in the browser
+    And the user enters the password "12345Aa_"
+    And the user repeats the password "12345Aa_"
+    And the user submits the password form
+    And the user clicks the sign in button
+    Then the user submits the credentials "regina@register.com" "12345Aa_"
+    And the user is logged in with username "Regina Register"
diff --git a/e2e-tests/cypress/e2e/UserProfile.ChangePassword.feature b/e2e-tests/cypress/e2e/UserProfile.ChangePassword.feature
index aa853f6ff..b7aa6960c 100644
--- a/e2e-tests/cypress/e2e/UserProfile.ChangePassword.feature
+++ b/e2e-tests/cypress/e2e/UserProfile.ChangePassword.feature
@@ -5,14 +5,14 @@ Feature: User profile - change password
   Background:
     # TODO for these pre-conditions utilize seeding or API check, if user exists in test system
     # Given the following "users" are in the database:
-    #   | email            | password | name          |
-    #   | bibi@bloxberg.de | Aa12345_ | Bibi Bloxberg |                        |
+    #   | email            | password | name               |
+    #   | bob@baumeister.de | Aa12345_ | Bob der Baumeister |
     
     # TODO instead of credentials use the name of an user object (see seeds in backend)
-    Given the user is logged in as "bibi@bloxberg.de" "Aa12345_"
+    Given the user is logged in as "bob@baumeister.de" "Aa12345_"
 
   Scenario: Change password successfully
-    Given the user navigates to page "/profile"
+    Given the user navigates to page "/settings"
     And the user opens the change password menu
     When the user fills the password form with:
       | Old password        | Aa12345_ |
@@ -21,7 +21,7 @@ Feature: User profile - change password
     And the user submits the password form
     And the user is presented a "success" message
     And the user logs out
-    Then the user submits the credentials "bibi@bloxberg.de" "Aa12345_"
+    Then the user submits the credentials "bob@baumeister.de" "Aa12345_"
     And the user cannot login
-    But the user submits the credentials "bibi@bloxberg.de" "12345Aa_"
-    And the user is logged in with username "Bibi Bloxberg"
+    But the user submits the credentials "bob@baumeister.de" "12345Aa_"
+    And the user is logged in with username "Bob der Baumeister"
diff --git a/e2e-tests/cypress/e2e/models/RegistrationPage.ts b/e2e-tests/cypress/e2e/models/RegistrationPage.ts
index 8cae26a26..2e9b48648 100644
--- a/e2e-tests/cypress/e2e/models/RegistrationPage.ts
+++ b/e2e-tests/cypress/e2e/models/RegistrationPage.ts
@@ -4,7 +4,7 @@ export class RegistrationPage {
   // selectors
   firstnameInput = '#registerFirstname'
   lastnameInput = '#registerLastname'
-  emailInput = '#Email-input-field'
+  emailInput = 'input[type=email]'
   checkbox = '#registerCheckbox'
   submitBtn = '[type=submit]'
 
@@ -35,7 +35,7 @@ export class RegistrationPage {
     cy.get(this.checkbox).click({ force: true })
   }
 
-  submitRegistrationPage() {
+  submitRegistrationForm() {
     cy.get(this.submitBtn).should('be.enabled')
     cy.get(this.submitBtn).click()
   }
diff --git a/e2e-tests/cypress/e2e/models/ResetPasswordPage.ts b/e2e-tests/cypress/e2e/models/ResetPasswordPage.ts
index 20134de6d..153b41a82 100644
--- a/e2e-tests/cypress/e2e/models/ResetPasswordPage.ts
+++ b/e2e-tests/cypress/e2e/models/ResetPasswordPage.ts
@@ -2,19 +2,19 @@
 
 export class ResetPasswordPage {
   // selectors
-  newPasswordBlock = '#new-password-input-field'
-  newPasswordRepeatBlock = '#repeat-new-password-input-field'
+  newPasswordInput = '#new-password-input-field'
+  newPasswordRepeatInput = '#repeat-new-password-input-field'
   resetPasswordBtn = 'button[type=submit]'
   resetPasswordMessageBlock = '[data-test="reset-password-message"]'
   signinBtn = '.btn.test-message-button'
 
   enterNewPassword(password: string) {
-    cy.get(this.newPasswordBlock).find('input[type=password]').type(password)
+    cy.get(this.newPasswordInput).find('input[type=password]').type(password)
     return this
   }
 
   repeatNewPassword(password: string) {
-    cy.get(this.newPasswordRepeatBlock)
+    cy.get(this.newPasswordRepeatInput)
       .find('input[type=password]')
       .type(password)
     return this
diff --git a/e2e-tests/cypress/e2e/models/SideNavMenu.ts b/e2e-tests/cypress/e2e/models/SideNavMenu.ts
index ccd177b66..b52f35ed4 100644
--- a/e2e-tests/cypress/e2e/models/SideNavMenu.ts
+++ b/e2e-tests/cypress/e2e/models/SideNavMenu.ts
@@ -11,7 +11,7 @@ export class SideNavMenu {
   }
 
   logout() {
-    cy.get(this.logoutMenu).click()
+    cy.get('.main-sidebar').find(this.logoutMenu).click()
     return this
   }
 }
diff --git a/e2e-tests/cypress/support/step_definitions/email_steps.ts b/e2e-tests/cypress/support/step_definitions/email_steps.ts
index b313442f2..d31e2474e 100644
--- a/e2e-tests/cypress/support/step_definitions/email_steps.ts
+++ b/e2e-tests/cypress/support/step_definitions/email_steps.ts
@@ -5,41 +5,55 @@ import { UserEMailSite } from '../../e2e/models/UserEMailSite'
 const userEMailSite = new UserEMailSite()
 const resetPasswordPage = new ResetPasswordPage()
 
-Then('the user receives an e-mail containing the password reset link', () => {
+Then('the user receives an e-mail containing the {string} link', (linkName: string) => {
+  let emailSubject: string
+  let linkPattern: RegExp
+
+  switch (linkName) {
+    case 'activation':
+      emailSubject = 'Email Verification'
+      linkPattern = /\/checkEmail\/[0-9]+\d/
+      break
+    case 'password reset':
+      emailSubject = 'asswor'
+      linkPattern = /\/reset-password\/[0-9]+\d/
+      break
+    default:
+      throw new Error(`Error in "Then the user receives an e-mail containing the {string} link" step: incorrect linkname string "${linkName}"`)
+  }
+  
   cy.origin(
     Cypress.env('mailserverURL'),
-    { args: userEMailSite },
-    (userEMailSite) => {
-      const linkPattern = /\/reset-password\/[0-9]+\d/
-
-      cy.visit('/') // navigate to user's e-maile site (on fake mail server)
+    { args: { emailSubject, linkPattern, userEMailSite } },
+    ({ emailSubject, linkPattern, userEMailSite }) => {      
+      cy.visit('/') // navigate to user's e-mail site (on fake mail server)
       cy.get(userEMailSite.emailInbox).should('be.visible')
 
       cy.get(userEMailSite.emailList)
         .find('.email-item')
-        .filter(':contains(asswor)')
+        .filter(`:contains(${emailSubject})`)
         .first()
         .click()
 
       cy.get(userEMailSite.emailMeta)
         .find(userEMailSite.emailSubject)
-        .contains('asswor')
+        .contains(emailSubject)
 
-      cy.get('.email-content')
+      cy.get('.email-content', { timeout: 2000})
         .find('.plain-text')
         .contains(linkPattern)
         .invoke('text')
         .then((text) => {
-          const resetPasswordLink = text.match(linkPattern)[0]
-          cy.task('setResetPasswordLink', resetPasswordLink)
+          const emailLink = text.match(linkPattern)[0]
+          cy.task('setEmailLink', emailLink)
         })
     }
   )
 })
 
-When('the user opens the password reset link in the browser', () => {
-  cy.task('getResetPasswordLink').then((passwordResetLink) => {
-    cy.visit(passwordResetLink)
+When('the user opens the {string} link in the browser', (linkName: string) => {
+  cy.task('getEmailLink').then((emailLink) => {
+    cy.visit(emailLink)
   })
-  cy.get(resetPasswordPage.newPasswordRepeatBlock).should('be.visible')
+  cy.get(resetPasswordPage.newPasswordInput).should('be.visible')
 })
diff --git a/e2e-tests/cypress/support/step_definitions/user_registration_steps.ts b/e2e-tests/cypress/support/step_definitions/user_registration_steps.ts
index 8f12338b0..e90956b6e 100644
--- a/e2e-tests/cypress/support/step_definitions/user_registration_steps.ts
+++ b/e2e-tests/cypress/support/step_definitions/user_registration_steps.ts
@@ -18,7 +18,7 @@ And('the user agrees to the privacy policy', () => {
 })
 
 And('the user submits the registration form', () => {
-  registrationPage.submitRegistrationPage()
+  registrationPage.submitRegistrationForm()
   cy.get(registrationPage.RegistrationThanxHeadline).should('be.visible')
   cy.get(registrationPage.RegistrationThanxText).should('be.visible')
 })
diff --git a/e2e-tests/package.json b/e2e-tests/package.json
index a6f817503..fc6403905 100644
--- a/e2e-tests/package.json
+++ b/e2e-tests/package.json
@@ -22,7 +22,7 @@
     "@cypress/browserify-preprocessor": "^3.0.2",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
     "@typescript-eslint/parser": "^5.38.0",
-    "cypress": "^10.4.0",
+    "cypress": "^12.7.0",
     "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.3",
diff --git a/federation/.env.dist b/federation/.env.dist
new file mode 100644
index 000000000..42b3d05bf
--- /dev/null
+++ b/federation/.env.dist
@@ -0,0 +1,11 @@
+# Database
+DB_HOST=localhost
+DB_PORT=3306
+DB_DATABASE=gradido_community
+DB_USER=root
+DB_PASSWORD=
+
+# Federation
+FEDERATION_API=1_0
+FEDERATION_PORT=5010
+FEDERATION_COMMUNITY_URL=http://localhost
diff --git a/federation/.env.template b/federation/.env.template
new file mode 100644
index 000000000..af6e8f627
--- /dev/null
+++ b/federation/.env.template
@@ -0,0 +1,16 @@
+CONFIG_VERSION=$FEDERATION_CONFIG_VERSION
+
+LOG_LEVEL=$LOG_LEVEL
+# this is set fix to false, because it is important for 'production' environments. only set to true if a graphql-playground should be in use
+GRAPHIQL=false
+
+# Database
+DB_HOST=$DB_HOST
+DB_PORT=$DB_PORT
+DB_DATABASE=$DB_DATABASE
+DB_USER=$DB_USER
+DB_PASSWORD=$DB_PASSWORD
+
+# Federation
+FEDERATION_COMMUNITY_URL=$FEDERATION_COMMUNITY_URL
+
diff --git a/federation/jest.config.js b/federation/jest.config.js
index 742f35fbb..dff5ab169 100644
--- a/federation/jest.config.js
+++ b/federation/jest.config.js
@@ -9,6 +9,11 @@ module.exports = {
     '!src/seeds/**',
     '!build/**',
   ],
+  coverageThreshold: {
+    global: {
+      lines: 72,
+    },
+  },
   setupFiles: ['<rootDir>/test/testSetup.ts'],
   setupFilesAfterEnv: [],
   modulePathIgnorePatterns: ['<rootDir>/build/'],
diff --git a/federation/package.json b/federation/package.json
index 8a0153cc5..e7e067435 100644
--- a/federation/package.json
+++ b/federation/package.json
@@ -11,7 +11,7 @@
     "build": "tsc --build",
     "clean": "tsc --build --clean",
     "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
-    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
+    "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles",
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r dotenv/config -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts ."
   },
diff --git a/federation/src/config/index.ts b/federation/src/config/index.ts
index c8a841315..f792448d0 100644
--- a/federation/src/config/index.ts
+++ b/federation/src/config/index.ts
@@ -11,7 +11,7 @@ Decimal.set({
 */
 
 const constants = {
-  DB_VERSION: '0060-update_communities_table',
+  DB_VERSION: '0061-event_refactoring',
   // DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
@@ -24,7 +24,6 @@ const constants = {
 }
 
 const server = {
-  PORT: process.env.PORT || 5010,
   // JWT_SECRET: process.env.JWT_SECRET || 'secret123',
   // JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '10m',
   GRAPHIQL: process.env.GRAPHIQL === 'true' || false,
@@ -40,21 +39,6 @@ const database = {
   TYPEORM_LOGGING_RELATIVE_PATH:
     process.env.TYPEORM_LOGGING_RELATIVE_PATH || 'typeorm.backend.log',
 }
-/*
-const community = {
-   COMMUNITY_NAME: process.env.COMMUNITY_NAME || 'Gradido Entwicklung',
-   COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/',
-   COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register',
-   COMMUNITY_REDEEM_URL: process.env.COMMUNITY_REDEEM_URL || 'http://localhost/redeem/{code}',
-   COMMUNITY_REDEEM_CONTRIBUTION_URL:
-     process.env.COMMUNITY_REDEEM_CONTRIBUTION_URL || 'http://localhost/redeem/CL-{code}',
-   COMMUNITY_DESCRIPTION:
-     process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
-}
-*/
-
-// This is needed by graphql-directive-auth
-// process.env.APP_SECRET = server.JWT_SECRET
 
 // Check config version
 constants.CONFIG_VERSION.CURRENT =
@@ -71,10 +55,8 @@ if (
 }
 
 const federation = {
-  // FEDERATION_DHT_TOPIC: process.env.FEDERATION_DHT_TOPIC || null,
-  // FEDERATION_DHT_SEED: process.env.FEDERATION_DHT_SEED || null,
-  FEDERATION_PORT: process.env.FEDERATION_PORT || 5010,
   FEDERATION_API: process.env.FEDERATION_API || '1_0',
+  FEDERATION_PORT: process.env.FEDERATION_PORT || 5010,
   FEDERATION_COMMUNITY_URL: process.env.FEDERATION_COMMUNITY_URL || null,
 }
 
diff --git a/federation/src/graphql/api/1_0/model/GetPublicKeyResult.ts b/federation/src/graphql/api/1_0/model/GetPublicKeyResult.ts
new file mode 100644
index 000000000..696c96cfe
--- /dev/null
+++ b/federation/src/graphql/api/1_0/model/GetPublicKeyResult.ts
@@ -0,0 +1,13 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { Field, ObjectType } from 'type-graphql'
+
+@ObjectType()
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export class GetPublicKeyResult {
+  constructor(pubKey: string) {
+    this.publicKey = pubKey
+  }
+
+  @Field(() => String)
+  publicKey: string
+}
diff --git a/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.test.ts b/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.test.ts
new file mode 100644
index 000000000..20e6c8228
--- /dev/null
+++ b/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.test.ts
@@ -0,0 +1,53 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '@/server/createServer'
+import { Community as DbCommunity } from '@entity/Community'
+
+let query: any
+
+// to do: We need a setup for the tests that closes the connection
+let con: any
+
+beforeAll(async () => {
+  const server = await createServer()
+  con = server.con
+  query = createTestClient(server.apollo).query
+  DbCommunity.clear()
+})
+
+afterAll(async () => {
+  await con.close()
+})
+
+describe('PublicKeyResolver', () => {
+  const getPublicKeyQuery = `
+    query {
+      getPublicKey
+       {
+        publicKey
+      }
+    }
+  `
+
+  describe('getPublicKey', () => {
+    beforeEach(async () => {
+      const homeCom = new DbCommunity()
+      homeCom.foreign = false
+      homeCom.apiVersion = '1_0'
+      homeCom.endPoint = 'endpoint-url'
+      homeCom.publicKey = Buffer.from('homeCommunity-publicKey')
+      await DbCommunity.insert(homeCom)
+    })
+
+    it('returns homeCommunity-publicKey', async () => {
+      await expect(query({ query: getPublicKeyQuery })).resolves.toMatchObject({
+        data: {
+          getPublicKey: {
+            publicKey: expect.stringMatching('homeCommunity-publicKey'),
+          },
+        },
+      })
+    })
+  })
+})
diff --git a/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.ts b/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.ts
new file mode 100644
index 000000000..f96f20c58
--- /dev/null
+++ b/federation/src/graphql/api/1_0/resolver/PublicKeyResolver.ts
@@ -0,0 +1,20 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { Query, Resolver } from 'type-graphql'
+import { federationLogger as logger } from '@/server/logger'
+import { Community as DbCommunity } from '@entity/Community'
+import { GetPublicKeyResult } from '../model/GetPublicKeyResult'
+
+@Resolver()
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export class PublicKeyResolver {
+  @Query(() => GetPublicKeyResult)
+  async getPublicKey(): Promise<GetPublicKeyResult> {
+    logger.debug(`getPublicKey() via apiVersion=1_0 ...`)
+    const homeCom = await DbCommunity.findOneOrFail({
+      foreign: false,
+      apiVersion: '1_0',
+    })
+    logger.info(`getPublicKey()-1_0... return publicKey=${homeCom.publicKey}`)
+    return new GetPublicKeyResult(homeCom.publicKey.toString())
+  }
+}
diff --git a/federation/src/index.ts b/federation/src/index.ts
index 9096cb260..71c7545aa 100644
--- a/federation/src/index.ts
+++ b/federation/src/index.ts
@@ -20,7 +20,7 @@ async function main() {
     if (CONFIG.GRAPHIQL) {
       // eslint-disable-next-line no-console
       console.log(
-        `GraphIQL available at http://localhost:${CONFIG.FEDERATION_PORT}`
+        `GraphIQL available at ${CONFIG.FEDERATION_COMMUNITY_URL}/api/${CONFIG.FEDERATION_API}`
       )
     }
   })
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index a32330f3b..023fd64fd 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -1,13 +1,18 @@
 module.exports = {
   verbose: true,
+  collectCoverage: true,
   collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'],
+  coverageThreshold: {
+    global: {
+      lines: 95,
+    },
+  },
   moduleFileExtensions: [
     'js',
     // 'jsx',
     'json',
     'vue',
   ],
-  // coverageReporters: ['lcov', 'text'],
   moduleNameMapper: {
     '\\.(css|less)$': 'identity-obj-proxy',
     '\\.(scss)$': '<rootDir>/src/assets/mocks/styleMock.js',
diff --git a/frontend/package.json b/frontend/package.json
index 9aa457c19..513b6b509 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.18.2",
+  "version": "1.19.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
@@ -10,7 +10,7 @@
     "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
     "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
-    "test": "cross-env TZ=UTC jest --coverage",
+    "test": "cross-env TZ=UTC jest",
     "locales": "scripts/sort.sh"
   },
   "dependencies": {
diff --git a/frontend/public/img/svg/community.svg b/frontend/public/img/svg/community.svg
new file mode 100644
index 000000000..8f1cdbd61
--- /dev/null
+++ b/frontend/public/img/svg/community.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;fill:#72778F;}
+	.st2{font-family:'FontAwesome5Free-Solid';}
+	.st3{font-size:54.1523px;}
+	.st4{display:inline;enable-background:new    ;}
+	.st5{fill:#72778F;}
+	.st6{font-size:56.8896px;}
+	.st7{font-size:51.2px;}
+	.st8{display:inline;}
+	.st9{enable-background:new    ;}
+	.st10{clip-path:url(#SVGID_00000044144592529643807670000007729734690606357893_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<text transform="matrix(1 0 0 1 5.4236 52.4902)" class="st1 st2 st3"></text>
+</g>
+<g id="mein_x5F_profil" class="st0">
+	<g class="st4">
+		<path class="st5" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<text transform="matrix(1 0 0 1 0 54.8652)" class="st1 st2 st6"></text>
+</g>
+<g id="Senden" class="st0">
+	<text transform="matrix(1 0 0 1 4.882812e-04 50.6426)" class="st1 st2 st7"></text>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st8">
+		<path id="Pfad_9173" class="st5" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st5" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community">
+	<g class="st9">
+		<path class="st5" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st8">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000137852128488145803360000002351992332542316180_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000137852128488145803360000002351992332542316180_);">
+			<path id="Pfad_9157" class="st5" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st5" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st5" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st5" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st5" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st5" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st5" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st5" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st5" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/home.svg b/frontend/public/img/svg/home.svg
new file mode 100644
index 000000000..9122b7e68
--- /dev/null
+++ b/frontend/public/img/svg/home.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;fill:#72778F;}
+	.st2{font-family:'FontAwesome5Free-Solid';}
+	.st3{font-size:51.1997px;}
+	.st4{fill:#72778F;}
+</style>
+<g id="Community" class="st0">
+	<text transform="matrix(1 0 0 1 -0.0903 49.2777)" class="st1 st2 st3"></text>
+</g>
+<g id="Home">
+	<g id="Haus" transform="translate(-319.046 -300.603)">
+		<path id="Pfad_9173" class="st4" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st4" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg
new file mode 100644
index 000000000..0510a5b60
--- /dev/null
+++ b/frontend/public/img/svg/info.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st6{fill:#047006;}
+</style>
+	<g id="info" fill-rule="evenodd" class="st6" transform="translate(0 -0.001)">
+	<!-- d="
+      CIRCLE:
+	  M (CX - R), CY
+      a R,R 0 1,0 (R * 2),0
+      a R,R 0 1,0 -(R * 2),0
+	  RECTANGLE
+	  MX YhHEIGHTvWIDTHh-HEIGHTz
+    " -->
+		<path d="M0,32 a32,32 0 1,0 64,0 a32,32 0 1,0 -64,0 
+		M28 28h8v24h-8z
+		M28,20 a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0"
+     fill="#72778F" fill-rule="evenodd" />
+	</g>
+</svg>
diff --git a/frontend/public/img/svg/lines.png b/frontend/public/img/svg/lines.png
new file mode 100644
index 000000000..d7bf781b4
Binary files /dev/null and b/frontend/public/img/svg/lines.png differ
diff --git a/frontend/public/img/svg/logout.svg b/frontend/public/img/svg/logout.svg
new file mode 100644
index 000000000..a9826a5dd
--- /dev/null
+++ b/frontend/public/img/svg/logout.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;enable-background:new    ;}
+	.st2{fill:#72778F;}
+	.st3{display:inline;opacity:0.6;}
+	.st4{enable-background:new    ;}
+	.st5{fill:#CD5656;}
+	.st6{display:inline;}
+	.st7{clip-path:url(#SVGID_00000031177400750764849750000007392222980339360955_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<g class="st1">
+		<path class="st2" d="M6.74,16.53L31.37,5.35c0.34-0.16,0.73-0.24,1.13-0.24c0.4,0,0.78,0.09,1.12,0.24l24.63,11.18
+			c1.75,0.79,1.75,3.44,0,4.23L33.62,31.94c-0.72,0.33-1.53,0.33-2.25,0L6.74,20.76C4.99,19.97,4.99,17.32,6.74,16.53z M58.26,34.33
+			L33.62,45.5c-0.72,0.33-1.53,0.33-2.25,0L6.74,34.33c-1.75-0.79-1.75-3.44,0-4.23l6.14-2.78l17.09,7.75
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.09-7.75l6.14,2.78C60.01,30.89,60.01,33.54,58.26,34.33z
+			 M58.26,47.85L33.62,59.01c-0.72,0.33-1.53,0.33-2.25,0L6.74,47.85c-1.75-0.79-1.75-3.44,0-4.23l6.12-2.77l17.12,7.76
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.12-7.76l6.12,2.77C60.01,44.41,60.01,47.05,58.26,47.85z"/>
+	</g>
+</g>
+<g id="mein_x5F_profil" class="st0">
+	<g class="st1">
+		<path class="st2" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,14.86v34.67c0,2.95-2.39,5.33-5.33,5.33H6.22C2.79,54.87,0,52.08,0,48.64V18.42
+			c0-1.47,1.19-2.67,2.67-2.67h4.44v-0.89c0-1.47,1.19-2.67,2.67-2.67h51.56C62.81,12.2,64,13.39,64,14.86z M7.11,48.64V21.09H5.33
+			v27.56c0,0.49,0.4,0.89,0.89,0.89C6.71,49.53,7.11,49.13,7.11,48.64z M56.89,25.09v-4.44c0-0.74-0.6-1.33-1.33-1.33h-40
+			c-0.74,0-1.33,0.6-1.33,1.33v4.44c0,0.74,0.6,1.33,1.33,1.33h40C56.29,26.42,56.89,25.82,56.89,25.09z M33.78,35.75v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C33.18,37.09,33.78,36.49,33.78,35.75z M33.78,46.42v-0.89c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89
+			c0,0.74,0.6,1.33,1.33,1.33h16.89C33.18,47.75,33.78,47.16,33.78,46.42z M56.89,35.75v-0.89c0-0.74-0.6-1.33-1.33-1.33H38.67
+			c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89C56.29,37.09,56.89,36.49,56.89,35.75z M56.89,46.42v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H38.67c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C56.29,47.75,56.89,47.16,56.89,46.42z"/>
+	</g>
+</g>
+<g id="settings" class="st0">
+	<g id="Settings" transform="translate(1)" class="st3">
+		<g class="st4">
+			<path class="st2" d="M53,20.34c-1.17,0.82-2.79,0.54-3.61-0.63c-4.31-6.14-11.36-9.87-18.86-9.98
+				c-6.09-0.09-11.77,2.17-15.95,6.36c-4.01,4.01-6.17,9.34-6.08,15.02l-0.02,2.56c-0.04,1.4-1.19,2.52-2.59,2.52
+				c-0.03,0-0.05,0-0.08,0c-1.43-0.04-2.56-1.24-2.51-2.67l0.01-2.32C3.2,24.09,5.9,17.43,10.9,12.41
+				c5.19-5.19,12.16-7.97,19.7-7.88c9.16,0.14,17.77,4.69,23.03,12.19C54.45,17.89,54.17,19.51,53,20.34z M19.29,23.79
+				c-2.03,2.49-3.08,5.52-3.02,8.75c0.07,4.39-0.29,8.8-1.07,13.1c-0.09,0.49-0.84,2.47-3.01,2.09c-1.41-0.26-2.34-1.6-2.09-3.01
+				c0.72-3.97,1.05-8.04,0.98-12.1c-0.07-4.4,1.42-8.7,4.19-12.1c0.91-1.11,2.53-1.28,3.65-0.38
+				C20.02,21.04,20.19,22.67,19.29,23.79z M42.2,33.37c0.08,5.5-0.32,11.03-1.22,16.43c-0.08,0.5-0.82,2.49-2.98,2.14
+				c-1.41-0.24-2.37-1.57-2.13-2.98c0.84-5.1,1.23-10.32,1.15-15.51c-0.05-3.25-2.84-5.94-6.22-5.99c-3.73-0.01-5.93,2.85-5.88,5.65
+				c0.09,5.56-0.44,11.12-1.55,16.53c-0.29,1.4-1.65,2.3-3.06,2.01c-1.4-0.29-2.3-1.66-2.01-3.06c1.04-5.04,1.52-10.22,1.44-15.4
+				c-0.09-5.83,4.53-10.93,11.14-10.92C37.02,22.36,42.11,27.34,42.2,33.37z M50.85,33.04c0.01,0.53,0.02,0.92,0.02,1.45
+				c0,3.89-0.22,7.72-0.65,11.49c-0.12,1-1.07,2.49-2.87,2.28c-1.42-0.16-2.44-1.45-2.28-2.87c0.46-4.05,0.67-8.18,0.6-12.28
+				c-0.12-7.89-6.85-14.41-15-14.54c-1.24-0.01-2.48,0.11-3.67,0.4c-1.39,0.32-2.79-0.53-3.12-1.93s0.53-2.79,1.93-3.12
+				c1.61-0.38,3.28-0.58,4.95-0.54C41.66,13.57,50.68,22.38,50.85,33.04z M33.55,33.7c0.17,10.7-1.72,19.08-3.18,24.25
+				c-0.32,1.15-1.36,1.89-2.49,1.89c-2.27,0-2.79-2.24-2.5-3.29c2.11-7.52,3.12-15.05,2.99-22.85c0-1.43,1.16-2.59,2.59-2.59
+				C32.39,31.1,33.55,32.27,33.55,33.7z M58.6,34.34c-0.01,1.42-1.17,2.57-2.59,2.57h-0.02c-1.43-0.01-2.58-1.18-2.57-2.62
+				c0.02-2.61,0-4.34-0.51-6.65c-0.31-1.4,0.58-2.78,1.97-3.09c1.41-0.32,2.78,0.58,3.09,1.97C58.64,29.57,58.62,31.94,58.6,34.34z"
+				/>
+		</g>
+	</g>
+</g>
+<g id="Senden" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
+			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
+			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
+			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
+			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
+			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
+			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
+			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
+			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
+			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
+			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
+	</g>
+</g>
+<g id="logout">
+	<g class="st4">
+		<path class="st5" d="M22.86,56.38H12.19C5.46,56.38,0,50.92,0,44.19V19.81C0,13.08,5.46,7.62,12.19,7.62h10.67
+			c0.84,0,1.52,0.69,1.52,1.52v5.08c0,0.84-0.69,1.52-1.52,1.52H12.19c-2.25,0-4.06,1.82-4.06,4.06v24.38
+			c0,2.25,1.82,4.06,4.06,4.06h10.67c0.84,0,1.52,0.69,1.52,1.52v5.08C24.38,55.69,23.7,56.38,22.86,56.38z M41.78,55.49
+			c-1.9,1.9-5.21,0.57-5.21-2.16V41.14H19.3c-1.69,0-3.05-1.36-3.05-3.05V25.9c0-1.69,1.36-3.05,3.05-3.05h17.27V10.66
+			c0-2.72,3.29-4.06,5.21-2.16l21.33,21.33c1.18,1.19,1.18,3.12,0,4.32L41.78,55.49z"/>
+	</g>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st6">
+		<path id="Pfad_9173" class="st2" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st2" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community" class="st0">
+	<g class="st1">
+		<path class="st2" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st6">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000057106565430898592500000001661123875775782306_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000057106565430898592500000001661123875775782306_);">
+			<path id="Pfad_9157" class="st2" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st2" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st2" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st2" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st2" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st2" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st2" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st2" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st2" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/my_profil.svg b/frontend/public/img/svg/my_profil.svg
new file mode 100644
index 000000000..ef41c2ef4
--- /dev/null
+++ b/frontend/public/img/svg/my_profil.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;fill:#72778F;}
+	.st2{font-family:'FontAwesome5Free-Solid';}
+	.st3{font-size:54.1523px;}
+	.st4{enable-background:new    ;}
+	.st5{fill:#72778F;}
+	.st6{font-size:56.8896px;}
+	.st7{font-size:51.2px;}
+	.st8{display:inline;}
+	.st9{font-size:51.1997px;}
+	.st10{clip-path:url(#SVGID_00000129207379519052237770000007964736051681552055_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<text transform="matrix(1 0 0 1 5.4236 52.4902)" class="st1 st2 st3"></text>
+</g>
+<g id="mein_x5F_profil">
+	<g class="st4">
+		<path class="st5" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<text transform="matrix(1 0 0 1 0 54.8652)" class="st1 st2 st6"></text>
+</g>
+<g id="Senden" class="st0">
+	<text transform="matrix(1 0 0 1 4.882812e-04 50.6426)" class="st1 st2 st7"></text>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st8">
+		<path id="Pfad_9173" class="st5" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st5" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community" class="st0">
+	<text transform="matrix(1 0 0 1 -0.0903 49.2777)" class="st1 st2 st9"></text>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st8">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000025415889365352747170000010559577976254934956_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000025415889365352747170000010559577976254934956_);">
+			<path id="Pfad_9157" class="st5" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st5" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st5" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st5" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st5" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st5" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st5" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st5" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st5" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/send.svg b/frontend/public/img/svg/send.svg
new file mode 100644
index 000000000..6f1d8dafa
--- /dev/null
+++ b/frontend/public/img/svg/send.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;fill:#72778F;}
+	.st2{font-family:'FontAwesome5Free-Solid';}
+	.st3{font-size:54.1523px;}
+	.st4{display:inline;enable-background:new    ;}
+	.st5{fill:#72778F;}
+	.st6{font-size:56.8896px;}
+	.st7{enable-background:new    ;}
+	.st8{display:inline;}
+	.st9{clip-path:url(#SVGID_00000039131194176967667170000001588002319106732182_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<text transform="matrix(1 0 0 1 5.4236 52.4902)" class="st1 st2 st3"></text>
+</g>
+<g id="mein_x5F_profil" class="st0">
+	<g class="st4">
+		<path class="st5" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<text transform="matrix(1 0 0 1 0 54.8652)" class="st1 st2 st6"></text>
+</g>
+<g id="Senden">
+	<g class="st7">
+		<path class="st5" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
+			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
+			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
+			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
+			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
+			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
+			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
+			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
+			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
+			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
+			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
+	</g>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st8">
+		<path id="Pfad_9173" class="st5" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st5" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community" class="st0">
+	<g class="st4">
+		<path class="st5" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st8">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000139291908983709205020000014339602762391354759_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000139291908983709205020000014339602762391354759_);">
+			<path id="Pfad_9157" class="st5" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st5" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st5" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st5" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st5" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st5" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st5" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st5" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st5" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/settings.svg b/frontend/public/img/svg/settings.svg
new file mode 100644
index 000000000..6966262f3
--- /dev/null
+++ b/frontend/public/img/svg/settings.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;enable-background:new    ;}
+	.st2{fill:#72778F;}
+	.st3{opacity:0.6;}
+	.st4{enable-background:new    ;}
+	.st5{display:inline;}
+	.st6{clip-path:url(#SVGID_00000125579706284381458460000010580698921969067440_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<g class="st1">
+		<path class="st2" d="M6.74,16.53L31.37,5.35c0.34-0.16,0.73-0.24,1.13-0.24c0.4,0,0.78,0.09,1.12,0.24l24.63,11.18
+			c1.75,0.79,1.75,3.44,0,4.23L33.62,31.94c-0.72,0.33-1.53,0.33-2.25,0L6.74,20.76C4.99,19.97,4.99,17.32,6.74,16.53z M58.26,34.33
+			L33.62,45.5c-0.72,0.33-1.53,0.33-2.25,0L6.74,34.33c-1.75-0.79-1.75-3.44,0-4.23l6.14-2.78l17.09,7.75
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.09-7.75l6.14,2.78C60.01,30.89,60.01,33.54,58.26,34.33z
+			 M58.26,47.85L33.62,59.01c-0.72,0.33-1.53,0.33-2.25,0L6.74,47.85c-1.75-0.79-1.75-3.44,0-4.23l6.12-2.77l17.12,7.76
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.12-7.76l6.12,2.77C60.01,44.41,60.01,47.05,58.26,47.85z"/>
+	</g>
+</g>
+<g id="mein_x5F_profil" class="st0">
+	<g class="st1">
+		<path class="st2" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,14.86v34.67c0,2.95-2.39,5.33-5.33,5.33H6.22C2.79,54.87,0,52.08,0,48.64V18.42
+			c0-1.47,1.19-2.67,2.67-2.67h4.44v-0.89c0-1.47,1.19-2.67,2.67-2.67h51.56C62.81,12.2,64,13.39,64,14.86z M7.11,48.64V21.09H5.33
+			v27.56c0,0.49,0.4,0.89,0.89,0.89C6.71,49.53,7.11,49.13,7.11,48.64z M56.89,25.09v-4.44c0-0.74-0.6-1.33-1.33-1.33h-40
+			c-0.74,0-1.33,0.6-1.33,1.33v4.44c0,0.74,0.6,1.33,1.33,1.33h40C56.29,26.42,56.89,25.82,56.89,25.09z M33.78,35.75v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C33.18,37.09,33.78,36.49,33.78,35.75z M33.78,46.42v-0.89c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89
+			c0,0.74,0.6,1.33,1.33,1.33h16.89C33.18,47.75,33.78,47.16,33.78,46.42z M56.89,35.75v-0.89c0-0.74-0.6-1.33-1.33-1.33H38.67
+			c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89C56.29,37.09,56.89,36.49,56.89,35.75z M56.89,46.42v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H38.67c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C56.29,47.75,56.89,47.16,56.89,46.42z"/>
+	</g>
+</g>
+<g id="settings">
+	<g id="Settings" transform="translate(1)" class="st3">
+		<g class="st4">
+			<path class="st2" d="M53,20.34c-1.17,0.82-2.79,0.54-3.61-0.63c-4.31-6.14-11.36-9.87-18.86-9.98
+				c-6.09-0.09-11.77,2.17-15.95,6.36c-4.01,4.01-6.17,9.34-6.08,15.02l-0.02,2.56c-0.04,1.4-1.19,2.52-2.59,2.52
+				c-0.03,0-0.05,0-0.08,0c-1.43-0.04-2.56-1.24-2.51-2.67l0.01-2.32C3.2,24.09,5.9,17.43,10.9,12.41
+				c5.19-5.19,12.16-7.97,19.7-7.88c9.16,0.14,17.77,4.69,23.03,12.19C54.45,17.89,54.17,19.51,53,20.34z M19.29,23.79
+				c-2.03,2.49-3.08,5.52-3.02,8.75c0.07,4.39-0.29,8.8-1.07,13.1c-0.09,0.49-0.84,2.47-3.01,2.09c-1.41-0.26-2.34-1.6-2.09-3.01
+				c0.72-3.97,1.05-8.04,0.98-12.1c-0.07-4.4,1.42-8.7,4.19-12.1c0.91-1.11,2.53-1.28,3.65-0.38
+				C20.02,21.04,20.19,22.67,19.29,23.79z M42.2,33.37c0.08,5.5-0.32,11.03-1.22,16.43c-0.08,0.5-0.82,2.49-2.98,2.14
+				c-1.41-0.24-2.37-1.57-2.13-2.98c0.84-5.1,1.23-10.32,1.15-15.51c-0.05-3.25-2.84-5.94-6.22-5.99c-3.73-0.01-5.93,2.85-5.88,5.65
+				c0.09,5.56-0.44,11.12-1.55,16.53c-0.29,1.4-1.65,2.3-3.06,2.01c-1.4-0.29-2.3-1.66-2.01-3.06c1.04-5.04,1.52-10.22,1.44-15.4
+				c-0.09-5.83,4.53-10.93,11.14-10.92C37.02,22.36,42.11,27.34,42.2,33.37z M50.85,33.04c0.01,0.53,0.02,0.92,0.02,1.45
+				c0,3.89-0.22,7.72-0.65,11.49c-0.12,1-1.07,2.49-2.87,2.28c-1.42-0.16-2.44-1.45-2.28-2.87c0.46-4.05,0.67-8.18,0.6-12.28
+				c-0.12-7.89-6.85-14.41-15-14.54c-1.24-0.01-2.48,0.11-3.67,0.4c-1.39,0.32-2.79-0.53-3.12-1.93s0.53-2.79,1.93-3.12
+				c1.61-0.38,3.28-0.58,4.95-0.54C41.66,13.57,50.68,22.38,50.85,33.04z M33.55,33.7c0.17,10.7-1.72,19.08-3.18,24.25
+				c-0.32,1.15-1.36,1.89-2.49,1.89c-2.27,0-2.79-2.24-2.5-3.29c2.11-7.52,3.12-15.05,2.99-22.85c0-1.43,1.16-2.59,2.59-2.59
+				C32.39,31.1,33.55,32.27,33.55,33.7z M58.6,34.34c-0.01,1.42-1.17,2.57-2.59,2.57h-0.02c-1.43-0.01-2.58-1.18-2.57-2.62
+				c0.02-2.61,0-4.34-0.51-6.65c-0.31-1.4,0.58-2.78,1.97-3.09c1.41-0.32,2.78,0.58,3.09,1.97C58.64,29.57,58.62,31.94,58.6,34.34z"
+				/>
+		</g>
+	</g>
+</g>
+<g id="Senden" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
+			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
+			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
+			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
+			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
+			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
+			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
+			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
+			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
+			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
+			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
+	</g>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st5">
+		<path id="Pfad_9173" class="st2" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st2" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community" class="st0">
+	<g class="st1">
+		<path class="st2" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st5">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000101071337026672449950000008400453584463692960_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000101071337026672449950000008400453584463692960_);">
+			<path id="Pfad_9157" class="st2" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st2" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st2" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st2" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st2" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st2" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st2" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st2" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st2" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/transaction.svg b/frontend/public/img/svg/transaction.svg
new file mode 100644
index 000000000..f7cb156ff
--- /dev/null
+++ b/frontend/public/img/svg/transaction.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+	.st1{fill:#72778F;}
+	.st2{display:none;}
+	.st3{display:inline;enable-background:new    ;}
+	.st4{display:inline;}
+	.st5{clip-path:url(#SVGID_00000023994710743791037210000011656225644761444505_);}
+</style>
+<g id="Transaktionen">
+	<g class="st0">
+		<path class="st1" d="M6.74,16.53L31.37,5.35c0.34-0.16,0.73-0.24,1.13-0.24c0.4,0,0.78,0.09,1.12,0.24l24.63,11.18
+			c1.75,0.79,1.75,3.44,0,4.23L33.62,31.94c-0.72,0.33-1.53,0.33-2.25,0L6.74,20.76C4.99,19.97,4.99,17.32,6.74,16.53z M58.26,34.33
+			L33.62,45.5c-0.72,0.33-1.53,0.33-2.25,0L6.74,34.33c-1.75-0.79-1.75-3.44,0-4.23l6.14-2.78l17.09,7.75
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.09-7.75l6.14,2.78C60.01,30.89,60.01,33.54,58.26,34.33z
+			 M58.26,47.85L33.62,59.01c-0.72,0.33-1.53,0.33-2.25,0L6.74,47.85c-1.75-0.79-1.75-3.44,0-4.23l6.12-2.77l17.12,7.76
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.12-7.76l6.12,2.77C60.01,44.41,60.01,47.05,58.26,47.85z"/>
+	</g>
+</g>
+<g id="mein_x5F_profil" class="st2">
+	<g class="st3">
+		<path class="st1" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st2">
+	<g class="st3">
+		<path class="st1" d="M64,14.86v34.67c0,2.95-2.39,5.33-5.33,5.33H6.22C2.79,54.87,0,52.08,0,48.64V18.42
+			c0-1.47,1.19-2.67,2.67-2.67h4.44v-0.89c0-1.47,1.19-2.67,2.67-2.67h51.56C62.81,12.2,64,13.39,64,14.86z M7.11,48.64V21.09H5.33
+			v27.56c0,0.49,0.4,0.89,0.89,0.89C6.71,49.53,7.11,49.13,7.11,48.64z M56.89,25.09v-4.44c0-0.74-0.6-1.33-1.33-1.33h-40
+			c-0.74,0-1.33,0.6-1.33,1.33v4.44c0,0.74,0.6,1.33,1.33,1.33h40C56.29,26.42,56.89,25.82,56.89,25.09z M33.78,35.75v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C33.18,37.09,33.78,36.49,33.78,35.75z M33.78,46.42v-0.89c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89
+			c0,0.74,0.6,1.33,1.33,1.33h16.89C33.18,47.75,33.78,47.16,33.78,46.42z M56.89,35.75v-0.89c0-0.74-0.6-1.33-1.33-1.33H38.67
+			c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89C56.29,37.09,56.89,36.49,56.89,35.75z M56.89,46.42v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H38.67c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C56.29,47.75,56.89,47.16,56.89,46.42z"/>
+	</g>
+</g>
+<g id="Senden" class="st2">
+	<g class="st3">
+		<path class="st1" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
+			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
+			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
+			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
+			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
+			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
+			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
+			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
+			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
+			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
+			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
+	</g>
+</g>
+<g id="Home" class="st2">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st4">
+		<path id="Pfad_9173" class="st1" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st1" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="Community" class="st2">
+	<g class="st3">
+		<path class="st1" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="Adressen" class="st2">
+	<g class="st4">
+		<defs>
+			<rect id="SVGID_1_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000152973741960951679760000018000196742558351546_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000152973741960951679760000018000196742558351546_);">
+			<path id="Pfad_9157" class="st1" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st1" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st1" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st1" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st1" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st1" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st1" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st1" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st1" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/img/svg/write.svg b/frontend/public/img/svg/write.svg
new file mode 100644
index 000000000..45638e32e
--- /dev/null
+++ b/frontend/public/img/svg/write.svg
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;enable-background:new    ;}
+	.st2{fill:#72778F;}
+	.st3{fill:#A2A6BB;}
+	.st4{display:inline;opacity:0.6;}
+	.st5{enable-background:new    ;}
+	.st6{clip-path:url(#SVGID_00000095319084122216941990000003876059359341478307_);}
+	.st7{fill:#F5F5F5;}
+	.st8{fill:#CD5656;}
+	.st9{display:inline;}
+	.st10{fill:#047006;}
+	.st11{fill:#FFFFFF;}
+	.st12{fill:#C2C2C2;}
+	.st13{clip-path:url(#SVGID_00000067941181806368316720000002317936364391484863_);}
+	.st14{fill-rule:evenodd;clip-rule:evenodd;fill:#C58D38;}
+	.st15{clip-path:url(#SVGID_00000063591109121623545610000007980139569245760180_);}
+</style>
+<g id="Transaktionen" class="st0">
+	<g class="st1">
+		<path class="st2" d="M6.74,16.53L31.37,5.35c0.34-0.16,0.73-0.24,1.13-0.24c0.4,0,0.78,0.09,1.12,0.24l24.63,11.18
+			c1.75,0.79,1.75,3.44,0,4.23L33.62,31.94c-0.72,0.33-1.53,0.33-2.25,0L6.74,20.76C4.99,19.97,4.99,17.32,6.74,16.53z M58.26,34.33
+			L33.62,45.5c-0.72,0.33-1.53,0.33-2.25,0L6.74,34.33c-1.75-0.79-1.75-3.44,0-4.23l6.14-2.78l17.09,7.75
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.09-7.75l6.14,2.78C60.01,30.89,60.01,33.54,58.26,34.33z
+			 M58.26,47.85L33.62,59.01c-0.72,0.33-1.53,0.33-2.25,0L6.74,47.85c-1.75-0.79-1.75-3.44,0-4.23l6.12-2.77l17.12,7.76
+			c0.8,0.36,1.65,0.55,2.52,0.55c0.87,0,1.72-0.18,2.52-0.55l17.12-7.76l6.12,2.77C60.01,44.41,60.01,47.05,58.26,47.85z"/>
+	</g>
+</g>
+<g id="Top_Stories" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,14.86v34.67c0,2.95-2.39,5.33-5.33,5.33H6.22C2.79,54.87,0,52.08,0,48.64V18.42
+			c0-1.47,1.19-2.67,2.67-2.67h4.44v-0.89c0-1.47,1.19-2.67,2.67-2.67h51.56C62.81,12.2,64,13.39,64,14.86z M7.11,48.64V21.09H5.33
+			v27.56c0,0.49,0.4,0.89,0.89,0.89C6.71,49.53,7.11,49.13,7.11,48.64z M56.89,25.09v-4.44c0-0.74-0.6-1.33-1.33-1.33h-40
+			c-0.74,0-1.33,0.6-1.33,1.33v4.44c0,0.74,0.6,1.33,1.33,1.33h40C56.29,26.42,56.89,25.82,56.89,25.09z M33.78,35.75v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C33.18,37.09,33.78,36.49,33.78,35.75z M33.78,46.42v-0.89c0-0.74-0.6-1.33-1.33-1.33H15.56c-0.74,0-1.33,0.6-1.33,1.33v0.89
+			c0,0.74,0.6,1.33,1.33,1.33h16.89C33.18,47.75,33.78,47.16,33.78,46.42z M56.89,35.75v-0.89c0-0.74-0.6-1.33-1.33-1.33H38.67
+			c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89C56.29,37.09,56.89,36.49,56.89,35.75z M56.89,46.42v-0.89
+			c0-0.74-0.6-1.33-1.33-1.33H38.67c-0.74,0-1.33,0.6-1.33,1.33v0.89c0,0.74,0.6,1.33,1.33,1.33h16.89
+			C56.29,47.75,56.89,47.16,56.89,46.42z"/>
+	</g>
+</g>
+<g id="share" class="st0">
+	<g class="st1">
+		<path class="st3" d="M63.85,56.87c0,3.77-3.05,6.82-6.82,6.82H6.98c-3.77,0-6.82-3.06-6.82-6.82V6.82C0.15,3.06,3.21,0,6.98,0
+			h50.05c3.77,0,6.82,3.06,6.82,6.82V56.87z M38,39.62l-9.66-5.79c0.16-0.64,0.25-1.3,0.25-1.98c0-0.68-0.09-1.34-0.25-1.97
+			l9.66-5.8c1.42,1.3,3.3,2.09,5.37,2.09c4.4,0,7.96-3.56,7.96-7.96s-3.57-7.96-7.96-7.96s-7.96,3.56-7.96,7.96
+			c0,0.68,0.09,1.34,0.25,1.98L26,25.97c-1.42-1.3-3.3-2.09-5.37-2.09c-4.4,0-7.96,3.56-7.96,7.96s3.57,7.96,7.96,7.96
+			c2.07,0,3.96-0.79,5.37-2.08l9.66,5.79c-0.16,0.63-0.25,1.29-0.25,1.98c0,4.4,3.57,7.96,7.96,7.96s7.96-3.56,7.96-7.96
+			s-3.57-7.96-7.96-7.96C41.3,37.53,39.42,38.33,38,39.62z"/>
+	</g>
+</g>
+<g id="settings" class="st0">
+	<g id="Settings" transform="translate(1)" class="st4">
+		<g class="st5">
+			<path class="st2" d="M53,20.34c-1.17,0.82-2.79,0.54-3.61-0.63c-4.31-6.14-11.36-9.87-18.86-9.98
+				c-6.09-0.09-11.77,2.17-15.95,6.36c-4.01,4.01-6.17,9.34-6.08,15.02l-0.02,2.56c-0.04,1.4-1.19,2.52-2.59,2.52
+				c-0.03,0-0.05,0-0.08,0c-1.43-0.04-2.56-1.24-2.51-2.67l0.01-2.32C3.2,24.09,5.9,17.43,10.9,12.41
+				c5.19-5.19,12.16-7.97,19.7-7.88c9.16,0.14,17.77,4.69,23.03,12.19C54.45,17.89,54.17,19.51,53,20.34z M19.29,23.79
+				c-2.03,2.49-3.08,5.52-3.02,8.75c0.07,4.39-0.29,8.8-1.07,13.1c-0.09,0.49-0.84,2.47-3.01,2.09c-1.41-0.26-2.34-1.6-2.09-3.01
+				c0.72-3.97,1.05-8.04,0.98-12.1c-0.07-4.4,1.42-8.7,4.19-12.1c0.91-1.11,2.53-1.28,3.65-0.38
+				C20.02,21.04,20.19,22.67,19.29,23.79z M42.2,33.37c0.08,5.5-0.32,11.03-1.22,16.43c-0.08,0.5-0.82,2.49-2.98,2.14
+				c-1.41-0.24-2.37-1.57-2.13-2.98c0.84-5.1,1.23-10.32,1.15-15.51c-0.05-3.25-2.84-5.94-6.22-5.99c-3.73-0.01-5.93,2.85-5.88,5.65
+				c0.09,5.56-0.44,11.12-1.55,16.53c-0.29,1.4-1.65,2.3-3.06,2.01c-1.4-0.29-2.3-1.66-2.01-3.06c1.04-5.04,1.52-10.22,1.44-15.4
+				c-0.09-5.83,4.53-10.93,11.14-10.92C37.02,22.36,42.11,27.34,42.2,33.37z M50.85,33.04c0.01,0.53,0.02,0.92,0.02,1.45
+				c0,3.89-0.22,7.72-0.65,11.49c-0.12,1-1.07,2.49-2.87,2.28c-1.42-0.16-2.44-1.45-2.28-2.87c0.46-4.05,0.67-8.18,0.6-12.28
+				c-0.12-7.89-6.85-14.41-15-14.54c-1.24-0.01-2.48,0.11-3.67,0.4c-1.39,0.32-2.79-0.53-3.12-1.93s0.53-2.79,1.93-3.12
+				c1.61-0.38,3.28-0.58,4.95-0.54C41.66,13.57,50.68,22.38,50.85,33.04z M33.55,33.7c0.17,10.7-1.72,19.08-3.18,24.25
+				c-0.32,1.15-1.36,1.89-2.49,1.89c-2.27,0-2.79-2.24-2.5-3.29c2.11-7.52,3.12-15.05,2.99-22.85c0-1.43,1.16-2.59,2.59-2.59
+				C32.39,31.1,33.55,32.27,33.55,33.7z M58.6,34.34c-0.01,1.42-1.17,2.57-2.59,2.57h-0.02c-1.43-0.01-2.58-1.18-2.57-2.62
+				c0.02-2.61,0-4.34-0.51-6.65c-0.31-1.4,0.58-2.78,1.97-3.09c1.41-0.32,2.78,0.58,3.09,1.97C58.64,29.57,58.62,31.94,58.6,34.34z"
+				/>
+		</g>
+	</g>
+</g>
+<g id="Senden" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,12.24v38.4c0,1.77-1.43,3.2-3.2,3.2H3.2c-1.77,0-3.2-1.43-3.2-3.2v-38.4c0-1.77,1.43-3.2,3.2-3.2h57.6
+			C62.57,9.04,64,10.47,64,12.24z M21.87,34.12c0-2-1.3-3.78-3.16-4.34l-4.5-1.35c-0.52-0.15-0.88-0.68-0.88-1.27
+			c0-0.73,0.53-1.32,1.18-1.32h2.81c0.46,0,0.9,0.13,1.28,0.37c0.32,0.2,0.74,0.19,1.01-0.07l1.18-1.12
+			c0.35-0.34,0.33-0.92-0.06-1.21c-0.91-0.68-2.01-1.08-3.14-1.13v-1.63c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8
+			v1.61c-2.36,0.06-4.27,2.06-4.27,4.51c0,2,1.3,3.78,3.16,4.34l4.5,1.35c0.52,0.15,0.88,0.68,0.88,1.27c0,0.73-0.53,1.32-1.18,1.32
+			h-2.81c-0.46,0-0.9-0.13-1.28-0.37c-0.32-0.2-0.74-0.19-1.01,0.07l-1.18,1.12c-0.35,0.34-0.33,0.92,0.06,1.21
+			c0.91,0.68,2.01,1.08,3.14,1.14v1.63c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.61
+			C19.96,38.57,21.87,36.58,21.87,34.12z M57.6,25.84c0-0.44-0.36-0.8-0.8-0.8H29.6c-0.44,0-0.8,0.36-0.8,0.8v1.6
+			c0,0.44,0.36,0.8,0.8,0.8h27.2c0.44,0,0.8-0.36,0.8-0.8V25.84z M41.6,35.44c0-0.44-0.36-0.8-0.8-0.8H29.6
+			c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h11.2c0.44,0,0.8-0.36,0.8-0.8V35.44z M57.6,35.44c0-0.44-0.36-0.8-0.8-0.8
+			h-8c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h8c0.44,0,0.8-0.36,0.8-0.8V35.44z"/>
+	</g>
+</g>
+<g id="Schreiben">
+	<g id="schreiben_icon" transform="translate(0 0)">
+		<g>
+			<defs>
+				<rect id="SVGID_1_" x="0.42" width="63.16" height="64"/>
+			</defs>
+			<clipPath id="SVGID_00000104686239521587677620000005551387290565555606_">
+				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+			</clipPath>
+			
+				<g id="Gruppe_4994" transform="translate(0 0)" style="clip-path:url(#SVGID_00000104686239521587677620000005551387290565555606_);">
+				<path id="Pfad_9152" class="st7" d="M62.97,12.37c-0.99,5.81-2.55,11.52-4.67,17.02c-0.15,0.36-0.44,0.66-0.79,0.83
+					c-4.29,1.79-8.6,3.55-12.9,5.32c-0.19,0.08-0.37,0.17-0.56,0.26l0.03,0.1H55.5c-1.04,1.72-2,3.34-3,4.93
+					c-0.19,0.28-0.46,0.51-0.78,0.64c-3.73,1.54-7.47,3.05-11.21,4.57l-4.36,1.77v0.14H46.4c-4.89,4.43-11.09,7.15-17.66,7.76
+					c-4.8,0.44-9.65,0.09-14.34-1.03c-0.39-0.12-0.82,0-1.07,0.32c-2.61,2.68-5.22,5.34-7.85,8c-1.06,1.22-2.91,1.36-4.13,0.3
+					c-0.35-0.3-0.62-0.68-0.79-1.11c-0.04-0.07-0.09-0.14-0.13-0.2v-2.01c0.44-0.62,0.92-1.21,1.42-1.78
+					c9.79-9.98,19.6-19.95,29.41-29.91c0.38-0.38,0.77-0.75,1.12-1.16c0.55-0.62,0.66-1.52,0.26-2.25
+					c-0.36-0.73-1.17-1.13-1.97-0.98c-0.51,0.14-0.97,0.41-1.35,0.79C22.63,31.45,15.95,38.22,9.28,45
+					c-0.15,0.16-0.32,0.3-0.53,0.51c-0.03-0.16-0.04-0.23-0.06-0.31c-0.44-3.19-0.52-6.42-0.25-9.64c0.43-5.66,2.37-11.1,5.62-15.75
+					c3.72-5.09,8.63-9.19,14.3-11.94c8.28-4,17.17-6.58,26.3-7.63c2.65-0.57,5.42-0.33,7.93,0.69C64.22,2.22,63.45,8.98,62.97,12.37
+					"/>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="mein_x5F_profil" class="st0">
+	<g class="st1">
+		<path class="st2" d="M56.7,51.31v4.64c0,2.96-2.4,5.35-5.35,5.35H12.11c-2.95,0-5.35-2.4-5.35-5.35v-4.64
+			c0-8.27,6.71-14.98,14.98-14.98h1.86c2.49,1.14,5.23,1.78,8.13,1.78s5.65-0.65,8.13-1.78h1.86C49.99,36.33,56.7,43.04,56.7,51.31z
+			 M17.46,18.49c0-7.88,6.39-14.27,14.27-14.27S46,10.61,46,18.49s-6.39,14.27-14.27,14.27S17.46,26.37,17.46,18.49z"/>
+	</g>
+</g>
+<g id="logout" class="st0">
+	<g class="st1">
+		<path class="st8" d="M22.86,56.38H12.19C5.46,56.38,0,50.92,0,44.19V19.81C0,13.08,5.46,7.62,12.19,7.62h10.67
+			c0.84,0,1.52,0.69,1.52,1.52v5.08c0,0.84-0.69,1.52-1.52,1.52H12.19c-2.25,0-4.06,1.82-4.06,4.06v24.38
+			c0,2.25,1.82,4.06,4.06,4.06h10.67c0.84,0,1.52,0.69,1.52,1.52v5.08C24.38,55.69,23.7,56.38,22.86,56.38z M41.78,55.49
+			c-1.9,1.9-5.21,0.57-5.21-2.16V41.14H19.3c-1.69,0-3.05-1.36-3.05-3.05V25.9c0-1.69,1.36-3.05,3.05-3.05h17.27V10.66
+			c0-2.72,3.29-4.06,5.21-2.16l21.33,21.33c1.18,1.19,1.18,3.12,0,4.32L41.78,55.49z"/>
+	</g>
+</g>
+<g id="info" class="st0">
+	<g id="Infobutton" transform="translate(0 -0.001)" class="st9">
+		<circle id="Ellipse_4" class="st10" cx="32" cy="32" r="32"/>
+		<rect id="Rechteck_49" x="28" y="28" class="st11" width="8" height="24"/>
+		<circle id="Ellipse_5" class="st11" cx="32" cy="20" r="4"/>
+	</g>
+</g>
+<g id="inactive" class="st0">
+	<g id="Gruppe_4989_00000054225602090163449300000007297713312140317098_" transform="translate(-772 -261.959)" class="st9">
+		<g id="Ellipse_17_00000142858137041837963310000001425871925284973490_" transform="translate(772 261.959)">
+			<circle class="st11" cx="32" cy="32" r="31.17"/>
+			<path class="st12" d="M32,64C14.35,64,0,49.64,0,32S14.35,0,32,0c17.65,0,32,14.35,32,32S49.65,64,32,64z M32,1.43
+				C15.14,1.43,1.43,15.14,1.43,32c0,16.85,13.71,30.57,30.57,30.57S62.57,48.85,62.57,32C62.57,15.14,48.85,1.43,32,1.43z"/>
+		</g>
+	</g>
+</g>
+<g id="vergaenglichkeit" class="st0">
+	<g class="st9">
+		<defs>
+			<rect id="SVGID_00000070085415845568073820000001771536674054423175_" x="8" width="48" height="64"/>
+		</defs>
+		<clipPath id="SVGID_00000085938528792957493290000002016998437306479290_">
+			<use xlink:href="#SVGID_00000070085415845568073820000001771536674054423175_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4987" style="clip-path:url(#SVGID_00000085938528792957493290000002016998437306479290_);">
+			<path id="Pfad_9145" class="st14" d="M30.49,7.29c-2.57,2.79-5.01,5.68-7.32,8.67c-3,3.84-5.62,7.95-7.84,12.28
+				C13.36,31.86,12.22,35.88,12,40c0,0,10,6,20,2.01c6.38-2.4,13.27-3.09,20-2.01c0-4.8-3.19-8.63-8.73-14.8l-0.12-0.13
+				C38.04,19.83,33.77,13.83,30.49,7.29L30.49,7.29z M28.84,3.2C30.76,1.18,32,0,32,0c0.42,1.41,0.92,2.79,1.48,4.15
+				c3.15,6.83,7.48,13.06,12.79,18.4C51.51,28.39,56,33.38,56,40c0,6.36-2.53,12.47-7.03,16.97c-1.11,1.11-2.33,2.11-3.64,2.98
+				c-6.66,4.45-15.11,5.29-22.52,2.22c-1.45-0.6-2.84-1.34-4.15-2.22c-5.29-3.54-8.96-9.03-10.21-15.27C8.15,43.14,8,41.57,8,40
+				C8,26.67,22.32,10.07,28.84,3.2"/>
+			<path id="Pfad_9146" class="st14" d="M18.21,31.1c2.18-4.55,5-8.76,8.37-12.52l2.83,2.83c-3.07,3.45-5.63,7.31-7.63,11.47
+				L18.21,31.1z"/>
+		</g>
+	</g>
+</g>
+<g id="favorit" class="st0">
+	<g class="st1">
+		<path class="st2" d="M8.08,6c0-3.31,2.69-6,6-6h36c3.31,0,6,2.69,6,6v58l-24-14l-24,14V6z"/>
+	</g>
+</g>
+<g id="Home" class="st0">
+	<g id="Haus" transform="translate(-319.046 -300.603)" class="st9">
+		<path id="Pfad_9173" class="st2" d="M356.12,358.2v-15.2h-10.16v14.91c-0.37,0.12-0.75,0.21-1.13,0.26c-4.54,0-9.07,0.04-13.61,0
+			c-2.24-0.02-3.13-0.92-3.14-3.14c-0.03-5.84-0.03-11.69,0.03-17.53c0.02-0.72,0.32-1.41,0.83-1.92
+			c7.28-6.08,14.61-12.1,22.02-18.21c0.51,0.38,1.01,0.71,1.47,1.09c6.69,5.5,13.35,11.03,20.07,16.5c1.01,0.7,1.58,1.88,1.52,3.1
+			c-0.09,5.5-0.03,11-0.04,16.5c0,2.79-0.78,3.6-3.5,3.61C365.8,358.21,361.14,358.2,356.12,358.2z"/>
+		<path id="Pfad_9174" class="st2" d="M351,313.85c-8.82,7.36-17.46,14.59-26.15,21.76c-0.76,0.64-2.31,1.49-2.69,1.2
+			c-1.26-1.03-2.31-2.29-3.09-3.72c-0.19-0.32,0.7-1.5,1.32-2.02c8.63-7.25,17.29-14.48,25.97-21.67c0.47-0.4,0.94-0.8,1.43-1.18
+			c1.88-1.68,4.73-1.64,6.58,0.08c3.02,2.47,6,4.99,9.43,7.85c0-2.56,0.05-4.71-0.02-6.85c-0.05-1.55,0.49-2.29,2.14-2.21
+			c1.92,0.1,3.84,0.1,5.76,0c1.68-0.09,2.33,0.51,2.3,2.24c-0.08,4.54-0.1,9.08,0.03,13.61c0.08,1.03,0.54,2,1.28,2.73
+			c2.16,2.01,4.48,3.84,6.79,5.7c0.87,0.45,1.21,1.52,0.76,2.39c-0.11,0.21-0.26,0.4-0.44,0.55c-2.7,3.45-2.67,3.48-5.96,0.73
+			l-23.43-19.55C352.41,314.97,351.76,314.47,351,313.85z"/>
+	</g>
+</g>
+<g id="drop_down" class="st0">
+	<g id="arrow" transform="translate(17.958 0.75) rotate(90)" class="st9">
+		<g>
+			
+				<ellipse id="Ellipse_75_00000110457846241914254590000001499777333948890023_" transform="matrix(2.535182e-06 1 -1 2.535182e-06 17.2081 -45.2926)" class="st7" cx="31.25" cy="-14.04" rx="28.43" ry="29.06"/>
+			<path class="st2" d="M62.75-14.04c0,17.05-14.13,30.91-31.5,30.91C13.88,16.87-0.25,3-0.25-14.04c0-17.04,14.13-30.91,31.5-30.91
+				C48.62-44.95,62.75-31.09,62.75-14.04z M4.63-14.04c0,14.31,11.94,25.96,26.62,25.96c14.68,0,26.62-11.64,26.62-25.96
+				C57.87-28.35,45.93-40,31.25-40C16.57-40,4.63-28.35,4.63-14.04z"/>
+		</g>
+		<polygon class="st2" points="39.8,-13.64 27.39,-1.23 23.65,-4.97 32.32,-13.64 23.65,-22.31 27.39,-26.05 		"/>
+	</g>
+</g>
+<g id="Community" class="st0">
+	<g class="st1">
+		<path class="st2" d="M9.7,42.88H3.11c-1.77,0-3.2-1.43-3.2-3.2v-3.2c0-3.53,2.87-6.4,6.4-6.4h6.4c1.76,0,3.35,0.71,4.51,1.86
+			C13.19,34.15,10.33,38.14,9.7,42.88z M3.11,20.48c0-3.53,2.87-6.4,6.4-6.4s6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			S3.11,24.01,3.11,20.48z M51.11,44.8v2.88c0,2.65-2.15,4.8-4.8,4.8h-28.8c-2.65,0-4.8-2.15-4.8-4.8V44.8
+			c0-6.36,5.16-11.52,11.52-11.52h0.83c2.09,1,4.39,1.6,6.85,1.6c2.46,0,4.77-0.6,6.85-1.6h0.83C45.95,33.28,51.11,38.44,51.11,44.8
+			z M20.71,18.88c0-6.19,5.01-11.2,11.2-11.2c6.19,0,11.2,5.01,11.2,11.2s-5.01,11.2-11.2,11.2C25.72,30.08,20.71,25.07,20.71,18.88
+			z M63.91,36.48v3.2c0,1.77-1.43,3.2-3.2,3.2h-6.6c-0.62-4.74-3.48-8.73-7.51-10.94c1.16-1.15,2.75-1.86,4.51-1.86h6.4
+			C61.04,30.08,63.91,32.95,63.91,36.48z M47.91,20.48c0-3.53,2.87-6.4,6.4-6.4c3.53,0,6.4,2.87,6.4,6.4s-2.87,6.4-6.4,6.4
+			C50.78,26.88,47.91,24.01,47.91,20.48z"/>
+	</g>
+</g>
+<g id="coin_x5F_icon" class="st0">
+	<g class="st1">
+		<path class="st10" d="M46.41,30.2c0,4.98-9.68,9.01-21.62,9.01S3.17,35.18,3.17,30.2s9.68-9.01,21.62-9.01S46.41,25.22,46.41,30.2
+			z M24.79,42.81c8.46,0,16.97-1.98,21.62-5.81v5.81c0,3.98-9.68,7.21-21.62,7.21S3.17,46.79,3.17,42.81V37
+			C7.82,40.83,16.34,42.81,24.79,42.81z M24.79,53.62c8.47,0,16.97-1.53,21.62-4.81v4.81c0,3.98-9.68,7.21-21.62,7.21
+			S3.17,57.6,3.17,53.62v-4.81C7.82,52.09,16.32,53.62,24.79,53.62z M17.59,10.38c0-3.98,9.68-7.21,21.62-7.21
+			s21.62,3.23,21.62,7.21s-9.68,7.21-21.62,7.21S17.59,14.35,17.59,10.38z M42.73,21.09c7.23-0.36,14.1-1.88,18.1-4.71v4.81
+			c0,2.74-4.58,5.12-11.34,6.34C48.5,24.86,46.06,22.7,42.73,21.09z M50.02,31.08c4.36-0.78,8.2-2.04,10.81-3.89V32
+			c0,2.67-4.36,4.99-10.81,6.24V31.08z"/>
+	</g>
+</g>
+<g id="clock" class="st0">
+	<g class="st1">
+		<path class="st2" d="M64,32c0,17.68-14.32,32-32,32C14.32,64,0,49.68,0,32S14.32,0,32,0C49.68,0,64,14.32,64,32z M44.39,39.1
+			c0-0.65-0.3-1.23-0.78-1.61L36.13,32V13.42c0-1.14-0.92-2.06-2.06-2.06h-4.13c-1.14,0-2.06,0.93-2.06,2.06v20.07
+			c0,1.63,0.75,3.08,1.94,4.03l8.64,6.41c0.35,0.28,0.8,0.45,1.29,0.45c0.65,0,1.23-0.3,1.61-0.78l2.58-3.23
+			C44.22,40.03,44.39,39.58,44.39,39.1z"/>
+	</g>
+</g>
+<g id="Adressen" class="st0">
+	<g class="st9">
+		<defs>
+			<rect id="SVGID_00000098937621113595409810000007709929726849059466_" x="3.98" y="4.04" width="55.34" height="55.46"/>
+		</defs>
+		<clipPath id="SVGID_00000011012408749757469700000003862327475291214757_">
+			<use xlink:href="#SVGID_00000098937621113595409810000007709929726849059466_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="Gruppe_4997" style="clip-path:url(#SVGID_00000011012408749757469700000003862327475291214757_);">
+			<path id="Pfad_9157" class="st2" d="M21.8,59.5V4.04h34.22c1.64-0.18,3.12,1,3.3,2.65c0.02,0.21,0.02,0.43,0,0.64
+				c0,16.29,0,32.58,0,48.88c0.17,1.65-1.02,3.12-2.67,3.29c-0.21,0.02-0.42,0.02-0.63,0H21.8 M25.72,31.78
+				c0.03,8.19,6.69,14.8,14.88,14.77c8.19-0.03,14.8-6.69,14.77-14.88c-0.03-8.16-6.65-14.77-14.82-14.77
+				C32.35,16.91,25.71,23.57,25.72,31.78C25.72,31.78,25.72,31.78,25.72,31.78"/>
+			<path id="Pfad_9158" class="st2" d="M9.92,54.54c0.69,0,1.33,0,1.97,0c2.19,0,3.96-1.77,3.96-3.96c0-2.18-1.77-3.95-3.96-3.96
+				c-0.63,0-1.27,0-1.99,0v-3.97c0.69,0,1.31,0,1.95,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96
+				c-0.62,0-1.23,0-1.95,0v-4.95h1.8c2.19,0.11,4.05-1.57,4.16-3.76c0.11-2.19-1.57-4.05-3.76-4.16c-0.14-0.01-0.27-0.01-0.41,0
+				H9.89V17.9c0.69,0,1.32,0,1.96,0c2.19,0,3.96-1.77,3.96-3.96c0-2.19-1.77-3.96-3.96-3.96c0,0,0,0,0,0c-0.62,0-1.23,0-1.99,0
+				c0-1.27,0.07-2.55,0.21-3.81c0.28-1.24,1.38-2.12,2.65-2.11c2.32-0.02,4.65-0.02,7.03-0.02v55.39c0,0-0.05,0.06-0.08,0.06
+				c-2.35,0-4.69,0.05-7.04,0c-1.47-0.09-2.63-1.27-2.71-2.73C9.88,56.05,9.92,55.36,9.92,54.54"/>
+			<path id="Pfad_9159" class="st2" d="M8.9,15.93c-0.95,0-1.89,0-2.84,0c-1.09,0-1.98-0.89-1.98-1.98c0-1.09,0.89-1.98,1.98-1.98
+				c1.89,0,3.79,0,5.68,0c1.09-0.06,2.03,0.77,2.1,1.86c0.06,1.09-0.77,2.03-1.86,2.1c-0.08,0-0.16,0-0.23,0
+				C10.79,15.92,9.85,15.92,8.9,15.93"/>
+			<path id="Pfad_9160" class="st2" d="M8.95,23.85c0.93,0,1.85,0,2.77,0c1.09-0.07,2.04,0.75,2.11,1.85
+				c0.07,1.09-0.75,2.04-1.84,2.11c-0.08,0.01-0.15,0.01-0.23,0c-1.89,0-3.79,0-5.68,0c-1.09,0.06-2.03-0.78-2.08-1.88
+				s0.78-2.03,1.88-2.08c0.08,0,0.16,0,0.23,0C7.05,23.85,7.99,23.85,8.95,23.85"/>
+			<path id="Pfad_9161" class="st2" d="M8.95,36.72c0.95,0,1.89,0,2.84,0c1.09-0.05,2.02,0.79,2.07,1.88
+				c0.05,1.09-0.79,2.02-1.88,2.07c-0.05,0-0.11,0-0.16,0c-1.93,0.01-3.87,0.01-5.8,0c-1.09,0.04-2.01-0.82-2.04-1.91
+				s0.82-2.01,1.91-2.04c0.05,0,0.11,0,0.16,0C7.02,36.72,7.98,36.72,8.95,36.72"/>
+			<path id="Pfad_9162" class="st2" d="M8.92,52.57c-0.95,0-1.89,0-2.84,0c-1.09,0.11-2.06-0.69-2.16-1.78s0.69-2.06,1.78-2.16
+				c0.12-0.01,0.25-0.01,0.37,0c1.91,0,3.83,0,5.74,0c1.09-0.05,2.02,0.79,2.07,1.88c0.05,1.09-0.79,2.02-1.88,2.07
+				c-0.05,0-0.11,0-0.16,0c-0.97,0-1.93,0-2.9,0"/>
+			<path id="Pfad_9163" class="st2" d="M44.92,30.89c2.24-2.47,2.04-6.29-0.43-8.53c-0.03-0.03-0.06-0.06-0.1-0.09
+				c-2.51-2.13-6.27-1.82-8.39,0.69c-1.96,2.31-1.87,5.73,0.2,7.93c-1.91,0.43-3.56,1.62-4.58,3.3c-0.87,1.73-1.2,3.69-0.95,5.61
+				c-3.79-4.48-3.98-10.98-0.47-15.69c4.37-5.58,12.43-6.57,18.02-2.2s6.57,12.43,2.2,18.02l0,0c0-0.86,0.03-1.61,0-2.36
+				c-0.03-2.76-1.72-5.23-4.28-6.27C45.75,31.15,45.34,31.01,44.92,30.89"/>
+			<path id="Pfad_9164" class="st2" d="M40.6,32.87c1.29-0.08,2.59-0.07,3.88,0.03c2.27,0.38,3.94,2.33,3.97,4.62
+				c0.04,1.34,0.02,2.68,0,4.02c-0.02,0.23-0.14,0.45-0.32,0.6c-4.5,3.32-10.63,3.32-15.13,0.02c-0.15-0.11-0.35-0.31-0.35-0.46
+				c-0.07-1.63-0.03-3.25,0.11-4.87c0.36-2.34,2.38-4.07,4.75-4.05c1.04-0.02,2.06,0,3.09,0C40.6,32.8,40.6,32.84,40.6,32.87"/>
+			<path id="Pfad_9165" class="st2" d="M40.57,22.86c2.19,0.01,3.95,1.78,3.95,3.97c-0.01,2.19-1.78,3.95-3.97,3.95
+				c-2.18-0.01-3.95-1.78-3.95-3.96C36.6,24.63,38.38,22.86,40.57,22.86L40.57,22.86"/>
+		</g>
+	</g>
+</g>
+<g id="active" class="st0">
+	<g id="Gruppe_4989" transform="translate(-772 -261.959)" class="st9">
+		<circle id="Ellipse_17" class="st10" cx="804" cy="293.96" r="32"/>
+		<path class="st7" d="M823.94,280.44c-1.25-1.24-3.28-1.24-4.52,0.01l-20.72,20.83l-7.99-9.07c-1.17-1.33-3.19-1.46-4.52-0.29
+			c-1.33,1.17-1.46,3.19-0.29,4.52l10.25,11.64c0.01,0.01,0.02,0.01,0.03,0.02c0.04,0.05,0.05,0.1,0.1,0.15
+			c0.62,0.62,1.44,0.93,2.26,0.93c0.26,0,0.51-0.09,0.76-0.15c0.13-0.03,0.26-0.03,0.38-0.07c0.16-0.06,0.3-0.18,0.46-0.27
+			c0.18-0.1,0.37-0.18,0.53-0.32c0.02-0.02,0.03-0.05,0.06-0.07c0.02-0.02,0.06-0.03,0.08-0.05l23.15-23.27
+			C825.2,283.71,825.2,281.68,823.94,280.44z"/>
+	</g>
+</g>
+</svg>
diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
index 67de86479..361f717af 100644
--- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss
+++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss
@@ -17,6 +17,7 @@ $gradido-248: rgb(248 248 248) !default;
 $gradido-140: rgb(140 66 5) !default;
 $gradido-205: rgb(205 86 86) !default;
 $gradido-197: rgb(197 141 56) !default;
+$gradido-209: rgb(209 209 209) !default;
 $gradido-4: rgb(4 112 6) !default;
 $black: #000 !default;
 $grays: () !default;
@@ -36,6 +37,7 @@ $grays: map.merge(
     "140": $gradido-140,
     "205": $gradido-205,
     "197": $gradido-197,
+    "209": $gradido-209,
     "4": $gradido-4
   ),
   $grays
@@ -75,6 +77,7 @@ $colors: map.merge(
     "140": $gradido-140,
     "205": $gradido-205,
     "197": $gradido-197,
+    "209": $gradido-209,
     "4": $gradido-4
   ),
   $colors
@@ -118,6 +121,7 @@ $theme-colors: map.merge(
     "140":          $gradido-140,
     "205":          $gradido-205,
     "197":          $gradido-197,
+    "209":          $gradido-209,
     "4":            $gradido-4
   ),
   $theme-colors
diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 9edb72a4f..645513205 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -21,6 +21,10 @@ body {
   padding: 1px;
 }
 
+.hover-font-bold:hover {
+  font-weight: bold;
+}
+
 .word-break {
   word-break: break-word;
 }
@@ -122,6 +126,10 @@ a:hover,
   border-bottom-right-radius: 17px !important;
 }
 
+.rounded-26 {
+  border-radius: 26px;
+}
+
 .alert {
   border-radius: 26px;
   box-shadow: rgb(0 0 0 / 14%) 0 24px 80px;
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 6ae9d5933..01f835197 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -1,6 +1,23 @@
 <template>
   <div class="contribution-messages-list-item">
-    <div v-if="isNotModerator" class="text-right pr-4 pr-lg-0 is-not-moderator">
+    <div v-if="message.type === 'HISTORY'">
+      <b-row class="mb-3 border border-197 p-1">
+        <b-col cols="10">
+          <small>{{ $d(new Date(message.createdAt), 'short') }}</small>
+          <div class="font-weight-bold" data-test="username">
+            {{ storeName.username }} {{ $t('contribution.isEdited') }}
+          </div>
+          <div class="small">
+            {{ $t('contribution.oldContribution') }}
+          </div>
+          <parse-message v-bind="message" data-test="message" class="p-2"></parse-message>
+        </b-col>
+        <b-col cols="2">
+          <avatar :username="storeName.username" :initials="storeName.initials"></avatar>
+        </b-col>
+      </b-row>
+    </div>
+    <div v-else-if="isNotModerator" class="text-right pr-4 pr-lg-0 is-not-moderator">
       <b-row class="mb-3">
         <b-col cols="10">
           <div class="font-weight-bold" data-test="username">{{ storeName.username }}</div>
diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 0aba4cbd1..c60a36a2d 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -74,7 +74,7 @@ describe('ContributionListItem', () => {
 
       it('is warning at when state is IN_PROGRESS', async () => {
         await wrapper.setProps({ state: 'IN_PROGRESS' })
-        expect(wrapper.vm.variant).toBe('f5')
+        expect(wrapper.vm.variant).toBe('205')
       })
     })
 
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 87ffeb682..56546d183 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
   <div>
     <div
       class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3"
-      :class="state === 'IN_PROGRESS' ? 'pulse border border-205' : ''"
+      :class="state === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
     >
       <b-row>
         <b-col cols="3" lg="2" md="2">
@@ -25,7 +25,11 @@
           </div>
           <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
           <div class="mb-3 text-break word-break">{{ memo }}</div>
-          <div v-if="state === 'IN_PROGRESS'" class="text-205">
+          <div
+            v-if="state === 'IN_PROGRESS'"
+            class="text-205 pointer hover-font-bold"
+            @click="visible = !visible"
+          >
             {{ $t('contribution.alert.answerQuestion') }}
           </div>
         </b-col>
@@ -189,14 +193,14 @@ export default {
       if (this.deletedAt) return 'trash'
       if (this.deniedAt) return 'x-circle'
       if (this.confirmedAt) return 'check'
-      if (this.state === 'IN_PROGRESS') return 'question-circle'
+      if (this.state === 'IN_PROGRESS') return 'question'
       return 'bell-fill'
     },
     variant() {
       if (this.deletedAt) return 'danger'
       if (this.deniedAt) return 'warning'
       if (this.confirmedAt) return 'success'
-      if (this.state === 'IN_PROGRESS') return 'f5'
+      if (this.state === 'IN_PROGRESS') return '205'
       return 'primary'
     },
     date() {
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 10884d5f1..b560e0767 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -105,10 +105,7 @@
                 </b-col>
                 <b-col cols="12" md="6" lg="6" class="text-lg-right">
                   <b-button block type="submit" variant="gradido">
-                    <span v-if="radioSelected === sendTypes.send">{{ $t('form.check_now') }}</span>
-                    <span v-if="radioSelected === sendTypes.link">
-                      {{ $t('form.generate_now') }}
-                    </span>
+                    {{ $t('form.check_now') }}
                   </b-button>
                 </b-col>
               </b-row>
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 62b69ebdd..e6e4cfe2a 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -33,8 +33,8 @@ describe('Sidebar', () => {
     })
 
     describe('the genaral section', () => {
-      it('has five nav-item', () => {
-        expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(5)
+      it('has six nav-items', () => {
+        expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(6)
       })
 
       it('has nav-item "navigation.overview" in navbar', () => {
@@ -49,35 +49,33 @@ describe('Sidebar', () => {
         expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('navigation.transactions')
       })
 
-      it('has nav-item "gdt.gdt" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('gdt.gdt')
+      it('has nav-item "creation" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('creation')
       })
 
-      it('has nav-item "creation" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(4).text()).toContain('creation')
+      it('has nav-item "GDT" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(4).text()).toContain('GDT')
+      })
+
+      it('has nav-item "navigation.info" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toContain('navigation.info')
       })
     })
 
     describe('the specific section', () => {
       describe('for standard users', () => {
-        it('has three nav-item', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(3)
-        })
-
-        it('has nav-item "navigation.info" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
-            'navigation.info',
-          )
+        it('has two nav-items', () => {
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(2)
         })
 
         it('has nav-item "navigation.settings" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
             'navigation.settings',
           )
         })
 
         it('has nav-item "navigation.logout" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(2).text()).toEqual(
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
             'navigation.logout',
           )
         })
@@ -89,30 +87,24 @@ describe('Sidebar', () => {
           wrapper = Wrapper()
         })
 
-        it('has four nav-item', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(4)
-        })
-
-        it('has nav-item "navigation.info" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
-            'navigation.info',
-          )
+        it('has three nav-items', () => {
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(3)
         })
 
         it('has nav-item "navigation.settings" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
             'navigation.settings',
           )
         })
 
         it('has nav-item "navigation.admin_area" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(2).text()).toEqual(
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
             'navigation.admin_area',
           )
         })
 
         it('has nav-item "navigation.logout" in navbar', () => {
-          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(3).text()).toEqual(
+          expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(2).text()).toEqual(
             'navigation.logout',
           )
         })
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 0875c0c7e..644fb37e0 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -9,34 +9,34 @@
       <div class="mb-3 mt-3">
         <b-nav vertical class="w-200">
           <b-nav-item to="/overview" class="mb-3" active-class="activeRoute">
-            <b-icon icon="house" aria-hidden="true"></b-icon>
+            <b-img src="/img/svg/home.svg" height="20" class="svg-icon" />
             <span class="ml-2">{{ $t('navigation.overview') }}</span>
           </b-nav-item>
           <b-nav-item to="/send" class="mb-3" active-class="activeRoute">
-            <b-icon icon="cash-stack" aria-hidden="true"></b-icon>
+            <b-icon icon="cash" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('navigation.send') }}</span>
           </b-nav-item>
           <b-nav-item to="/transactions" class="mb-3" active-class="activeRoute">
-            <b-icon icon="layers" aria-hidden="true"></b-icon>
+            <b-img src="/img/svg/transaction.svg" height="20" class="svg-icon" />
             <span class="ml-2">{{ $t('navigation.transactions') }}</span>
           </b-nav-item>
+          <b-nav-item to="/community" class="mb-3" active-class="activeRoute">
+            <b-img src="/img/svg/community.svg" height="20" class="svg-icon" />
+            <span class="ml-2">{{ $t('creation') }}</span>
+          </b-nav-item>
           <b-nav-item to="/gdt" class="mb-3" active-class="activeRoute">
             <b-icon icon="layers" aria-hidden="true"></b-icon>
-            <span class="ml-2">{{ $t('gdt.gdt') }}</span>
+            <span class="ml-2">{{ $t('GDT') }}</span>
           </b-nav-item>
-          <b-nav-item to="/community" class="" active-class="activeRoute">
-            <b-icon icon="people" aria-hidden="true"></b-icon>
-            <span class="ml-2">{{ $t('creation') }}</span>
-          </b-nav-item>
-        </b-nav>
-        <hr />
-        <b-nav vertical class="w-100">
-          <b-nav-item to="/information" class="mb-3" active-class="activeRoute">
-            <b-icon icon="info-circle" aria-hidden="true"></b-icon>
+          <b-nav-item to="/information" active-class="activeRoute">
+            <b-img src="/img/svg/info.svg" height="20" class="svg-icon" />
             <span class="ml-2">{{ $t('navigation.info') }}</span>
           </b-nav-item>
+        </b-nav>
+        <hr class="m-3" />
+        <b-nav vertical class="w-100">
           <b-nav-item to="/settings" class="mb-3" active-class="activeRoute">
-            <b-icon icon="gear" aria-hidden="true"></b-icon>
+            <b-img src="/img/svg/settings.svg" height="20" class="svg-icon" />
             <span class="ml-2">{{ $t('navigation.settings') }}</span>
           </b-nav-item>
           <b-nav-item
@@ -48,8 +48,13 @@
             <b-icon icon="shield-check" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('navigation.admin_area') }}</span>
           </b-nav-item>
-          <b-nav-item class="font-weight-bold" @click="$emit('logout')" active-class="activeRoute">
-            <b-icon icon="power" aria-hidden="true" variant="danger"></b-icon>
+          <b-nav-item
+            class="font-weight-bold"
+            @click="$emit('logout')"
+            active-class="activeRoute"
+            data-test="logout-menu"
+          >
+            <b-img src="/img/svg/logout.svg" height="20" class="svg-icon" />
             <span class="ml-2 text-205">{{ $t('navigation.logout') }}</span>
           </b-nav-item>
         </b-nav>
@@ -74,10 +79,17 @@ export default {
   color: rgb(2, 2, 1);
   border-left: 4px rgb(219, 129, 19) solid;
 }
+.svg-icon {
+  filter: brightness(1) invert(0);
+}
+
+.activeRoute .svg-icon {
+  filter: brightness(0) invert(0);
+}
+
 #component-sidebar {
   min-width: 200px;
 }
-
 @media screen and (min-width: 1025px) {
   #side-menu {
     max-width: 180px;
@@ -86,7 +98,7 @@ export default {
     min-width: 180px;
   }
 }
-
+/*
 @media screen and (min-width: 1075px) {
   #side-menu {
     max-width: 200px;
@@ -102,5 +114,5 @@ export default {
   #component-sidebar {
     max-width: 100%;
   }
-}
+} */
 </style>
diff --git a/frontend/src/components/MobileSidebar/MobileSidebar.vue b/frontend/src/components/MobileSidebar/MobileSidebar.vue
index 158c42f0d..9c371a0fc 100644
--- a/frontend/src/components/MobileSidebar/MobileSidebar.vue
+++ b/frontend/src/components/MobileSidebar/MobileSidebar.vue
@@ -1,7 +1,15 @@
 <template>
   <div>
-    <b-sidebar id="sidebar-mobile" :backdrop="true" bg-variant="transparent">
-      <div class="px-3 py-2">
+    <b-sidebar
+      id="sidebar-mobile"
+      sidebar-class="sidebar-radius"
+      width="220px"
+      :backdrop="true"
+      bg-variant="white"
+      no-header-close
+    >
+      <b-img src="img/svg/lines.png" />
+      <div class="py-2">
         <sidebar @admin="$emit('admin')" @logout="$emit('logout')" :shadow="false" />
       </div>
     </b-sidebar>
@@ -17,3 +25,9 @@ export default {
   },
 }
 </script>
+<style>
+.sidebar-radius {
+  border-bottom-right-radius: 26px;
+  border-top-right-radius: 26px;
+}
+</style>
diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
index ca96ce914..9748eb187 100644
--- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue
+++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
@@ -1,25 +1,19 @@
 <template>
-  <div class="nav-community container">
-    <b-row class="nav-row">
-      <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn to="contribute" active-class="btn-active" block variant="link">
-          <b-icon icon="pencil" class="mr-2" />
-          {{ $t('community.submitContribution') }}
-        </b-btn>
-      </b-col>
-      <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn to="contributions" active-class="btn-active" block variant="link">
-          <b-icon icon="person" class="mr-2" />
-          {{ $t('community.myContributions') }}
-        </b-btn>
-      </b-col>
-      <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn to="community" active-class="btn-active" block variant="link">
-          <b-icon icon="people" class="mr-2" />
-          {{ $t('community.community') }}
-        </b-btn>
-      </b-col>
-    </b-row>
+  <div class="nav-community">
+    <div class="bg-209 rounded-26 d-flex bd-highlight mx-xl-6 mx-lg-5 shadow">
+      <b-btn to="contribute" active-class="btn-active svg-icon-active" block variant="link">
+        <b-img src="/img/svg/write.svg" height="20" class="svg-icon" />
+        {{ $t('community.submitContribution') }}
+      </b-btn>
+      <b-btn to="contributions" active-class="btn-active svg-icon-active" block variant="link">
+        <b-img src="/img/svg/my_profil.svg" height="20" class="svg-icon" />
+        {{ $t('community.myContributions') }}
+      </b-btn>
+      <b-btn to="community" active-class="btn-active svg-icon-active" block variant="link">
+        <b-img src="/img/svg/community.svg" height="20" class="svg-icon" />
+        {{ $t('community.community') }}
+      </b-btn>
+    </div>
   </div>
 </template>
 <script>
@@ -28,13 +22,25 @@ export default {
 }
 </script>
 <style scoped>
-.nav-row {
+.btn {
   background-color: rgb(209, 209, 209);
-  border-radius: 26px;
+  color: black;
+  padding-right: 0px;
+  padding-left: 0px;
+}
+.btn-block + .btn-block {
+  margin-top: 0rem;
 }
 
+.svg-icon {
+  filter: brightness(0) invert(0);
+}
 .btn-active {
   background-color: rgb(23 141 129);
   color: white;
+  font-weight: bold;
+}
+.btn-active .svg-icon {
+  filter: brightness(0) invert(1);
 }
 </style>
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index d0086ceab..46041f87f 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -47,51 +47,53 @@ describe('TransactionLinkSummary', () => {
     beforeEach(() => {
       apolloQueryMock.mockResolvedValue({
         data: {
-          listTransactionLinks: [
-            {
-              amount: '75',
-              link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-              createdAt: '2022-03-16T14:22:40.000Z',
-              holdAvailableAmount: '5.13109484759482747111',
-              id: 86,
-              memo:
-                'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
-              redeemedAt: null,
-              validUntil: '2022-03-30T14:22:40.000Z',
-            },
-            {
-              amount: '85',
-              link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-              createdAt: '2022-03-16T14:22:40.000Z',
-              holdAvailableAmount: '5.13109484759482747111',
-              id: 107,
-              memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
-              redeemedAt: null,
-              validUntil: '2022-03-30T14:22:40.000Z',
-            },
-            {
-              amount: '95',
-              link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-              createdAt: '2022-03-16T14:22:40.000Z',
-              holdAvailableAmount: '5.13109484759482747111',
-              id: 92,
-              memo:
-                'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
-              redeemedAt: null,
-              validUntil: '2022-03-30T14:22:40.000Z',
-            },
-            {
-              amount: '150',
-              link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-              createdAt: '2022-03-16T14:22:40.000Z',
-              holdAvailableAmount: '5.13109484759482747111',
-              id: 16,
-              memo:
-                'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
-              redeemedAt: null,
-              validUntil: '2022-03-30T14:22:40.000Z',
-            },
-          ],
+          listTransactionLinks: {
+            links: [
+              {
+                amount: '75',
+                link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 86,
+                memo:
+                  'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '85',
+                link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 107,
+                memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '95',
+                link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 92,
+                memo:
+                  'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+              {
+                amount: '150',
+                link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                createdAt: '2022-03-16T14:22:40.000Z',
+                holdAvailableAmount: '5.13109484759482747111',
+                id: 16,
+                memo:
+                  'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
+                redeemedAt: null,
+                validUntil: '2022-03-30T14:22:40.000Z',
+              },
+            ],
+          },
         },
       })
 
@@ -166,51 +168,53 @@ describe('TransactionLinkSummary', () => {
           jest.clearAllMocks()
           apolloQueryMock.mockResolvedValue({
             data: {
-              listTransactionLinks: [
-                {
-                  amount: '76',
-                  link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-                  createdAt: '2022-03-16T14:22:40.000Z',
-                  holdAvailableAmount: '5.13109484759482747111',
-                  id: 87,
-                  memo:
-                    'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
-                  redeemedAt: null,
-                  validUntil: '2022-03-30T14:22:40.000Z',
-                },
-                {
-                  amount: '86',
-                  link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-                  createdAt: '2022-03-16T14:22:40.000Z',
-                  holdAvailableAmount: '5.13109484759482747111',
-                  id: 108,
-                  memo:
-                    'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
-                  redeemedAt: null,
-                  validUntil: '2022-03-30T14:22:40.000Z',
-                },
-                {
-                  amount: '96',
-                  link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-                  createdAt: '2022-03-16T14:22:40.000Z',
-                  holdAvailableAmount: '5.13109484759482747111',
-                  id: 93,
-                  memo:
-                    'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
-                  redeemedAt: null,
-                  validUntil: '2022-03-30T14:22:40.000Z',
-                },
-                {
-                  amount: '150',
-                  link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
-                  createdAt: '2022-03-16T14:22:40.000Z',
-                  holdAvailableAmount: '5.13109484759482747111',
-                  id: 17,
-                  memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
-                  redeemedAt: null,
-                  validUntil: '2022-03-30T14:22:40.000Z',
-                },
-              ],
+              listTransactionLinks: {
+                links: [
+                  {
+                    amount: '76',
+                    link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                    createdAt: '2022-03-16T14:22:40.000Z',
+                    holdAvailableAmount: '5.13109484759482747111',
+                    id: 87,
+                    memo:
+                      'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
+                    redeemedAt: null,
+                    validUntil: '2022-03-30T14:22:40.000Z',
+                  },
+                  {
+                    amount: '86',
+                    link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                    createdAt: '2022-03-16T14:22:40.000Z',
+                    holdAvailableAmount: '5.13109484759482747111',
+                    id: 108,
+                    memo:
+                      'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
+                    redeemedAt: null,
+                    validUntil: '2022-03-30T14:22:40.000Z',
+                  },
+                  {
+                    amount: '96',
+                    link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                    createdAt: '2022-03-16T14:22:40.000Z',
+                    holdAvailableAmount: '5.13109484759482747111',
+                    id: 93,
+                    memo:
+                      'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
+                    redeemedAt: null,
+                    validUntil: '2022-03-30T14:22:40.000Z',
+                  },
+                  {
+                    amount: '150',
+                    link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+                    createdAt: '2022-03-16T14:22:40.000Z',
+                    holdAvailableAmount: '5.13109484759482747111',
+                    id: 17,
+                    memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
+                    redeemedAt: null,
+                    validUntil: '2022-03-30T14:22:40.000Z',
+                  },
+                ],
+              },
             },
           })
           await wrapper.setData({
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue
index b54c0e687..c3a62357b 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue
@@ -90,7 +90,10 @@ export default {
             fetchPolicy: 'network-only',
           })
           .then((result) => {
-            this.transactionLinks = [...this.transactionLinks, ...result.data.listTransactionLinks]
+            this.transactionLinks = [
+              ...this.transactionLinks,
+              ...result.data.listTransactionLinks.links,
+            ]
             this.$emit('update-transactions')
             this.pending = false
           })
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 111eb7ab5..55858b09b 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -128,7 +128,7 @@ export const deleteContribution = gql`
 `
 
 export const createContributionMessage = gql`
-  mutation($contributionId: Float!, $message: String!) {
+  mutation($contributionId: Int!, $message: String!) {
     createContributionMessage(contributionId: $contributionId, message: $message) {
       id
       message
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index e199a3730..7193eded0 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -126,14 +126,16 @@ export const queryTransactionLink = gql`
 export const listTransactionLinks = gql`
   query($currentPage: Int = 1, $pageSize: Int = 5) {
     listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize) {
-      id
-      amount
-      holdAvailableAmount
-      memo
-      link
-      createdAt
-      validUntil
-      redeemedAt
+      links {
+        id
+        amount
+        holdAvailableAmount
+        memo
+        link
+        createdAt
+        validUntil
+        redeemedAt
+      }
     }
   }
 `
@@ -163,13 +165,13 @@ export const listContributions = gql`
     $currentPage: Int = 1
     $pageSize: Int = 25
     $order: Order = DESC
-    $filterConfirmed: Boolean = false
+    $statusFilter: [ContributionStatus!]
   ) {
     listContributions(
       currentPage: $currentPage
       pageSize: $pageSize
       order: $order
-      filterConfirmed: $filterConfirmed
+      statusFilter: $statusFilter
     ) {
       contributionCount
       contributionList {
diff --git a/frontend/src/layouts/templates/CommunityTemplate.spec.js b/frontend/src/layouts/templates/CommunityTemplate.spec.js
index cd4b598ef..534e45125 100644
--- a/frontend/src/layouts/templates/CommunityTemplate.spec.js
+++ b/frontend/src/layouts/templates/CommunityTemplate.spec.js
@@ -50,7 +50,7 @@ describe('CommunityTemplate', () => {
         expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill')
         expect(listItems.at(0).text()).toBe('contribution.alert.pending')
 
-        expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square')
+        expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question')
         expect(listItems.at(1).text()).toBe('contribution.alert.in_progress')
 
         expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check')
@@ -80,7 +80,7 @@ describe('CommunityTemplate', () => {
         expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill')
         expect(listItems.at(0).text()).toBe('contribution.alert.pending')
 
-        expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square')
+        expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question')
         expect(listItems.at(1).text()).toBe('contribution.alert.in_progress')
 
         expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check')
diff --git a/frontend/src/layouts/templates/CommunityTemplate.vue b/frontend/src/layouts/templates/CommunityTemplate.vue
index 448c06bd2..f014af2c0 100644
--- a/frontend/src/layouts/templates/CommunityTemplate.vue
+++ b/frontend/src/layouts/templates/CommunityTemplate.vue
@@ -24,7 +24,7 @@
             {{ $t('contribution.alert.pending') }}
           </li>
           <li>
-            <b-icon icon="question-square" variant="warning"></b-icon>
+            <b-icon icon="question" variant="205"></b-icon>
             {{ $t('contribution.alert.in_progress') }}
           </li>
           <li>
@@ -54,7 +54,7 @@
             {{ $t('contribution.alert.pending') }}
           </li>
           <li>
-            <b-icon icon="question-square" variant="warning"></b-icon>
+            <b-icon icon="question" variant="205"></b-icon>
             {{ $t('contribution.alert.in_progress') }}
           </li>
           <li>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c826b9e30..719ed4cad 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -27,9 +27,9 @@
     "moderator": "Moderator",
     "moderators": "Moderatoren",
     "myContributions": "Meine Beiträge",
-    "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.",
-    "openContributionLinks": "Öffentliche Beitrags-Linkliste",
-    "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
+    "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.",
+    "openContributionLinks": "Per Link erzeugte Schöpfungen",
+    "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:",
     "submitContribution": "Schreiben"
   },
   "communityInfo": "Gemeinschaft Information",
@@ -56,6 +56,7 @@
       "openAmountForMonth": "Für <b>{monthAndYear}</b> kannst du noch <b>{creation}</b> GDD einreichen.",
       "yourContribution": "Dein Beitrag zum Gemeinwohl"
     },
+    "isEdited": "hat den Beitrag bearbeitet",
     "lastContribution": "Letzte Beiträge",
     "noContributions": {
       "allContributions": "Es wurden noch keine Beiträge eingereicht.",
@@ -67,6 +68,7 @@
       "lastMonth": "Für den ausgewählten Monat ist das Schöpfungslimit erreicht.",
       "thisMonth": "Für den aktuellen Monat ist das Schöpfungslimit erreicht."
     },
+    "oldContribution": "Vorherige Version",
     "selectDate": "Wann war dein Beitrag?",
     "submit": "Einreichen",
     "submitted": "Der Beitrag wurde eingereicht.",
@@ -214,7 +216,6 @@
     "factor": "Faktor",
     "formula": "Berechnungsformel",
     "funding": "Zu den Förderbeiträgen",
-    "gdt": "Gradido Transform",
     "gdt-received": "Gradido Transform (GDT) erhalten",
     "gdtKonto": "GDT Konto",
     "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 193aff666..a0c06dc56 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -27,9 +27,9 @@
     "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "My contributions",
-    "noOpenContributionLinkText": "Currently there are no automatic creations.",
-    "openContributionLinks": "Open contribution-link list",
-    "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
+    "noOpenContributionLinkText": "Currently there are no link-generated creations.",
+    "openContributionLinks": "Creations generated by link",
+    "openContributionLinkText": "The \"{name}\" community currently supports {count} link-generated creations:",
     "submitContribution": "Contribute"
   },
   "communityInfo": "Community Information",
@@ -56,6 +56,7 @@
       "openAmountForMonth": "For  <b>{monthAndYear}</b>, you can still submit <b>{creation}</b> GDD.",
       "yourContribution": "Your Contributions to the Common Good"
     },
+    "isEdited": "edited the contribution",
     "lastContribution": "Last Contributions",
     "noContributions": {
       "allContributions": "No contributions have been submitted yet.",
@@ -67,6 +68,7 @@
       "lastMonth": "The creation limit is reached for the selected month.",
       "thisMonth": "The creation limit has been reached for the current month."
     },
+    "oldContribution": "Previous version",
     "selectDate": "When was your contribution?",
     "submit": "Submit",
     "submitted": "The contribution was submitted.",
@@ -214,7 +216,6 @@
     "factor": "Factor",
     "formula": "Calculation formula",
     "funding": "To the funding contributions",
-    "gdt": "Gradido Transform",
     "gdt-received": "Gradido Transform (GDT) received",
     "gdtKonto": "GDT Konto",
     "no-transactions": "You do not have Gradido Transform (GDT) yet.",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 9441a10a2..725eb10ad 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -26,8 +26,9 @@
     "moderator": "Moderador",
     "moderators": "Moderadores",
     "myContributions": "Mis contribuciones al bien común",
-    "openContributionLinks": "lista de enlaces de contribuciones públicas",
-    "openContributionLinkText": "La comunidad \"{name}\" proporciona actualmente las siguientes {count} creaciones automáticas.",
+    "noOpenContributionLinkText": "Actualmente no hay creaciones generadas por enlaces.",
+    "openContributionLinks": "Creaciones generadas por enlace",
+    "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:",
     "other-communities": "Otras comunidades",
     "statistic": "Estadísticas",
     "submitContribution": "escribir",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 9e2c11fc5..102825acc 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -27,9 +27,9 @@
     "moderator": "Modérateur",
     "moderators": "Modérateurs",
     "myContributions": "Mes contributions",
-    "noOpenContributionLinkText": "Currently there are no automatic creations.",
-    "openContributionLinks": "liste de liens de contribution publique",
-    "openContributionLinkText": "Les {count} créations automatiques suivantes sont actuellement fournies par la communauté \"{name}\".",
+    "noOpenContributionLinkText": "Actuellement, il n'y a pas de créations générées par lien.",
+    "openContributionLinks": "Créations générées par lien",
+    "openContributionLinkText": "La communauté \"{name}\" soutient actuellement {count} créations générées par lien:",
     "submitContribution": "Contribuer"
   },
   "communityInfo": "Information communauté^^",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 0ac052c47..f1306eda8 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -26,8 +26,9 @@
     "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "Mijn bijdragen voor het algemeen belang",
-    "openContributionLinks": "openbare lijst van bijdragen",
-    "openContributionLinkText": "De volgende {count} automatische creaties worden momenteel aangeboden door de gemeenschap \"{name}\".",
+    "noOpenContributionLinkText": "Er zijn momenteel geen link-gegenereerde creaties.",
+    "openContributionLinks": "Creaties gegenereerd door link",
+    "openContributionLinkText": "De community \"{name}\" ondersteunt momenteel {count} link-gegenereerde creaties:",
     "other-communities": "Verdere gemeenschappen",
     "statistic": "Statistieken",
     "submitContribution": "schrijf",
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 773b78278..80d07b9ff 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -5,7 +5,7 @@
       <div class="pb-5">{{ $t('site.forgotPassword.heading') }}</div>
       <b-row class="justify-content-center">
         <b-col>
-          <validation-observer ref="observer" v-slot="{ handleSubmit }">
+          <validation-observer ref="observer" v-slot="{ handleSubmit, valid }">
             <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
               <input-email
                 v-model="form.email"
@@ -13,11 +13,13 @@
                 :label="$t('form.email')"
                 :placeholder="$t('form.email')"
               ></input-email>
-              <div class="text-center">
-                <b-button type="submit" variant="gradido">
+              <b-row>
+                <b-col cols="12" lg="6">
+                <b-button type="submit" :variant="valid ? 'gradido' : 'gradido-disable'" block :disabled="!valid">
                   {{ $t('settings.password.send_now') }}
                 </b-button>
-              </div>
+              </b-col>
+            </b-row>
             </b-form>
           </validation-observer>
         </b-col>
@@ -88,3 +90,13 @@ export default {
   },
 }
 </script>
+<style scoped>
+.btn-gradido {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+.btn-gradido-disable {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 2a3c05dc7..c02ee0e45 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -2,7 +2,7 @@
   <div class="login-form">
     <b-container v-if="enterData">
       <div class="pb-5" align="center">{{ $t('gdd_per_link.isFree') }}</div>
-      <validation-observer ref="observer" v-slot="{ handleSubmit }">
+      <validation-observer ref="observer" v-slot="{ handleSubmit, valid }">
         <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
           <b-row>
             <b-col sm="12" md="12" lg="6">
@@ -30,8 +30,15 @@
             </b-col>
           </b-row>
           <b-row>
-            <b-col cols="12" lg="4">
-              <b-button type="submit" variant="gradido" block>{{ $t('login') }}</b-button>
+            <b-col cols="12" lg="6">
+              <b-button
+                type="submit"
+                :variant="valid ? 'gradido' : 'gradido-disable'"
+                block
+                :disabled="!valid"
+              >
+                {{ $t('login') }}
+              </b-button>
             </b-col>
           </b-row>
         </b-form>
@@ -127,3 +134,13 @@ export default {
   },
 }
 </script>
+<style scoped>
+.btn-gradido {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+.btn-gradido-disable {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index c2877e897..5f53b8ac1 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -81,7 +81,7 @@
             </b-col>
           </b-row>
           <b-row>
-            <b-col cols="12" lg="5">
+            <b-col cols="12" lg="6">
               <b-button
                 block
                 type="submit"
@@ -174,3 +174,13 @@ export default {
   },
 }
 </script>
+<style scoped>
+.btn-gradido {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+.btn-gradido-disable {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 5c791ac61..6fa76d994 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -1,20 +1,24 @@
 <template>
   <div v-if="enterData" class="resetpwd-form">
     <div class="pb-5">{{ $t('site.resetPassword.heading') }}</div>
-    <validation-observer ref="observer" v-slot="{ handleSubmit }">
+    <validation-observer ref="observer" v-slot="{ handleSubmit, valid }">
       <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
         <input-password-confirmation v-model="form" />
-        <div class="text-center">
-          <b-button
-            type="submit"
-            variant="gradido"
-            class="mt-4"
-            data-test="submit-new-password-btn"
-          >
-            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
-            {{ $t(displaySetup.button) }}
-          </b-button>
-        </div>
+        <b-row>
+          <b-col cols="12" lg="6">
+            <b-button
+              block
+              type="submit"
+              :variant="valid ? 'gradido' : 'gradido-disable'"
+              class="mt-4"
+              data-test="submit-new-password-btn"
+              :disabled="!valid"
+            >
+              <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
+              {{ $t(displaySetup.button) }}
+            </b-button>
+          </b-col>
+        </b-row>
       </b-form>
     </validation-observer>
   </div>
@@ -149,3 +153,13 @@ export default {
   },
 }
 </script>
+<style scoped>
+.btn-gradido {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+.btn-gradido-disable {
+  padding-right: 0px;
+  padding-left: 0px;
+}
+</style>
diff --git a/package.json b/package.json
index 2220c1a85..cba894803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.18.2",
+  "version": "1.19.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",
diff --git a/scripts/release.sh b/scripts/release.sh
index 80a54d949..df6ece9b6 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -7,6 +7,8 @@ FRONTEND_DIR="${PROJECT_DIR}/frontend/"
 BACKEND_DIR="${PROJECT_DIR}/backend/"
 DATABASE_DIR="${PROJECT_DIR}/database/"
 ADMIN_DIR="${PROJECT_DIR}/admin/"
+DHTNODE_DIR="${PROJECT_DIR}/dht-node/"
+FEDERATION_DIR="${PROJECT_DIR}/federation/"
 
 # navigate to project directory
 cd ${PROJECT_DIR}
@@ -26,6 +28,10 @@ cd ${DATABASE_DIR}
 yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
 cd ${ADMIN_DIR}
 yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
+cd ${DHTNODE_DIR}
+yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
+cd ${FEDERATION_DIR}
+yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION}
 
 # generate changelog
 cd ${PROJECT_DIR}