diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84f7494ff6b88b29eefcfb6fea1d446364f125d8..e7d8d0e8ba0011af79d91fa36ec755726086d7f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,20 @@
-variables: 
-  OCC_ENABLE_AFTER_DEPLOY: 'false'
-  APP_NAME: 'Murena'
-  
 include:
   - project: "e/infra/ecloud/nextcloud-apps/ci-templates"
     ref: main
     file: "nc-apps-checkout-deploy.yml"
 
+.deploy:nextcloud-app-by-checkout:
+  script:
+    # print var to confirm
+    - echo "Deploying $APP_NAME to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST):${DEPLOYMENT_PATH}${APP_PATH}"
+    # clone repo to /tmp
+    - |
+      ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
+      git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}/snappymail
+      sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}${APP_PATH}
+      EOT
+    - echo "SUCCESS" > .job_status
+  after_script:
+    # reading job status, checking it and implementing additional steps
+    # are not handled here as rm -rf /tmp/${CI_JOB_ID} will always execute
+    - ssh $SSH_USER@$DEPLOYMENT_HOST "rm -rf /tmp/${CI_JOB_ID}"
diff --git a/styles.css b/style.css
similarity index 93%
rename from styles.css
rename to style.css
index 75933d5200c7cd2e8c36e7161ef13031526cd7f2..6531946b5808fa07a64cc84e1670df94fbfd9bdf 100644
--- a/styles.css
+++ b/style.css
@@ -491,7 +491,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     border-bottom: 1px solid var(--color-border-grey);
 }
 #rl-app .b-footer.btn-toolbar .btn-group a.btn.fontastic:nth-child(1){
-    background-image: url('images/back.svg');
+    background-image: url('/themes/Murena/snappymail/images/back.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:34px;
@@ -502,7 +502,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     color: transparent;
 }
 #rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.icon-folder-add{
-    background-image: url('images/createfolder.svg');
+    background-image: url('/themes/Murena/snappymail/images/createfolder.svg');
     background-position: center right;
     background-repeat: no-repeat;
     height:34px;
@@ -517,7 +517,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 
 #rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled a.btn:nth-child(2){
-    background-image: url('images/setting.svg');
+    background-image: url('/themes/Murena/snappymail/images/setting.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:34px;
@@ -647,7 +647,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders .b-folders-system li:nth-child(1) a.selectable::before
 {
-    background-image: url('images/inbox.svg');
+    background-image: url('/themes/Murena/snappymail/images/inbox.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -658,7 +658,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(1) a.selectable.selected::before
 {
-    background-image: url('images/inbox-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/inbox-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -669,7 +669,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(2) a.selectable::before
 {
-    background-image: url('images/sent.svg');
+    background-image: url('/themes/Murena/snappymail/images/sent.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -680,7 +680,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(2) a.selectable.selected::before
 {
-    background-image: url('images/sent-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/sent-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -691,7 +691,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(3) a.selectable::before
 {
-    background-image: url('images/draft.svg');
+    background-image: url('/themes/Murena/snappymail/images/draft.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -702,7 +702,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(3) a.selectable.selected::before
 {
-    background-image: url('images/draft-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/draft-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -713,7 +713,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(4) a.selectable::before
 {
-    background-image: url('images/spam.svg');
+    background-image: url('/themes/Murena/snappymail/images/spam.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -724,7 +724,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(4) a.selectable.selected::before
 {
-    background-image: url('images/spam-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/spam-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -735,7 +735,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(5) a.selectable.selected::before
 {
-    background-image: url('images/trash-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/trash-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -746,7 +746,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(5) a.selectable::before
 {
-    background-image: url('images/trash.svg');
+    background-image: url('/themes/Murena/snappymail/images/trash.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -757,7 +757,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(6) a.selectable.selected::before
 {
-    background-image: url('images/archieve-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/archieve-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -768,7 +768,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders  .b-folders-system li:nth-child(6) a.selectable::before
 {
-    background-image: url('images/archieve.svg');
+    background-image: url('/themes/Murena/snappymail/images/archieve.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -779,7 +779,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders .b-folders-user li a.selectable.selected::before
 {
-    background-image: url('images/folder-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/folder-color.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -790,7 +790,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app .b-folders .b-folders-user li a.selectable::before
 {
-    background-image: url('images/folder.svg');
+    background-image: url('/themes/Murena/snappymail/images/folder.svg');
     content: "";
     background-position: left center;
     background-repeat: no-repeat;
@@ -826,7 +826,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app #rl-content .btn.buttonCompose::before {
     content:"";
-    background-image: url('images/editnote.svg');
+    background-image: url('/themes/Murena/snappymail/images/editnote.svg');
     background-position: left center;
     background-repeat: no-repeat;
     padding-left: 20px;
@@ -960,7 +960,7 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
     border-bottom: 1px solid var(--color-border-grey);
 }
 #rl-app #V-MailMessageList.btn-toolbar .btn-group a.btn:nth-child(1) {
-    background-image: url('images/loading.svg');
+    background-image: url('/themes/Murena/snappymail/images/loading.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -968,7 +968,7 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
     padding-right: 19px;
 }
 #rl-app #V-MailMessageList .btn-toolbar a.btn:nth-child(1) .icon-spinner{
-    background-image: url('images/loading.svg');
+    background-image: url('/themes/Murena/snappymail/images/loading.svg');
     background-position: center center;
     background-repeat: no-repeat;
     width: 24px;
@@ -993,7 +993,7 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
  }
  #rl-app #V-MailMessageList input.inputSearch {
     padding-left:36px;
-    background-image: url('images/search.svg');
+    background-image: url('/themes/Murena/snappymail/images/search.svg');
     background-position: 10px center;
     background-repeat: no-repeat;
     height:40px;
@@ -1209,7 +1209,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
 }
 
 #rl-app .messageList .btn.buttonMoreSearch {
-    background-image: url('images/downicon.svg');
+    background-image: url('/themes/Murena/snappymail/images/downicon.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -1467,7 +1467,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     color:var(--color-primary);
 }
 #rl-app #V-MailMessageView .b-message-view-backdrop .backdrop-message::before{
-    background-image: url(images/createfolder-color.svg);
+    background-image: url('/themes/Murena/snappymail/images/createfolder-color.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 18px;
@@ -1757,14 +1757,14 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 #rl-app #V-SystemDropDown #top-system-dropdown-id .fontastic:nth-child(1) {
 
     color:transparent;
-    background-image: url('images/profilesetting.svg');
+    background-image: url('/themes/Murena/snappymail/images/profilesetting.svg');
     background-position: center center;
     background-repeat: no-repeat;
     font-size:20px;
 }
 #rl-app #V-SystemDropDown #top-system-dropdown-id:after {
     color:transparent;
-    background-image: url('images/profiledownarrow.svg');
+    background-image: url('/themes/Murena/snappymail/images/profiledownarrow.svg');
     background-position: center center;
     background-repeat: no-repeat;
     padding-left:10px;
@@ -1980,7 +1980,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width:41px;
  }
 #rl-app #V-PopupsCompose .btn-group:nth-of-type(3)  a.btn.fontastic:nth-child(2) {
-    background-image: url('images/attachnextcloud-files.svg');
+    background-image: url('/themes/Murena/snappymail/images/attachnextcloud-files.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:32px;
@@ -2058,7 +2058,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     padding-top:9px;
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show .email-title[data-icon="✔"]::before {
-    background-image: url('images/profiletick.svg');
+    background-image: url('/themes/Murena/snappymail/images/profiletick.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2067,7 +2067,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show .dividerbar a[data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"]::before {
     content: "";
-    background-image: url('images/plus.svg');
+    background-image: url('/themes/Murena/snappymail/images/plus.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2076,7 +2076,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/CONTACTS"]::before {
     content: "";
-    background-image: url('images/contactsmall.svg');
+    background-image: url('/themes/Murena/snappymail/images/contactsmall.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2085,7 +2085,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li  a[data-i18n="HIDE_MY_EMAIL/TAB_NAME"]::before {
     content: "";
-    background-image: url('images/hide-my-email.svg');
+    background-image: url('/themes/Murena/snappymail/images/hide-my-email.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2094,7 +2094,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li  a[data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"]::before {
     content: "";
-    background-image: url('images/setting.svg');
+    background-image: url('/themes/Murena/snappymail/images/setting.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2104,7 +2104,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TOP_TOOLBAR/BUTTON_HELP"]::before {
     content: "";
-    background-image: url('images/help.svg');
+    background-image: url('/themes/Murena/snappymail/images/help.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2113,7 +2113,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show  li a[data-i18n="MOBILE/BUTTON_MOBILE_VERSION"]::before {
     content: "";
-    background-image: url('images/mobile.svg');
+    background-image: url('/themes/Murena/snappymail/images/mobile.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2146,7 +2146,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
    display:none;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(1) a.btn.disabled {
-    background-image: url('images/createfolder.svg');
+    background-image: url('/themes/Murena/snappymail/images/createfolder.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2154,7 +2154,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(1) a.btn {
-    background-image: url('images/createfolder.svg');
+    background-image: url('/themes/Murena/snappymail/images/createfolder.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2162,7 +2162,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.disabled:nth-child(1) {
-    background-image: url('images/archieve.svg');
+    background-image: url('/themes/Murena/snappymail/images/archieve.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2170,7 +2170,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn:nth-child(1) {
-    background-image: url('images/archieve.svg');
+    background-image: url('/themes/Murena/snappymail/images/archieve.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2178,7 +2178,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic.disabled:nth-child(2) {
-    background-image: url('images/spam.svg');
+    background-image: url('/themes/Murena/snappymail/images/spam.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2186,7 +2186,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic:nth-child(2) {
-    background-image: url('images/spam.svg');
+    background-image: url('/themes/Murena/snappymail/images/spam.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2194,7 +2194,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic.disabled:nth-child(4) {
-    background-image: url('images/trash.svg');
+    background-image: url('/themes/Murena/snappymail/images/trash.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2202,7 +2202,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic:nth-child(4) {
-    background-image: url('images/trash.svg');
+    background-image: url('/themes/Murena/snappymail/images/trash.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2210,7 +2210,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     width: 50px;
 }
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(3) #more-list-dropdown-id,#rl-app #more-view-dropdown-id {
-    background-image: url('images/more.svg') !important;
+    background-image: url('/themes/Murena/snappymail/images/more.svg') !important;
     background-position: center center !important;
     background-repeat: no-repeat !important;
     height:18px;
@@ -2219,7 +2219,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(4) #sort-list-dropdown-id {
-    background-image: url('images/sort.svg');
+    background-image: url('/themes/Murena/snappymail/images/sort.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:18px;
@@ -2234,7 +2234,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background: var(--color-primary-text);
 }
 #rl-app #rl-content #V-Settings-Folders .btn .icon-folder-add{
-    background-image: url('images/createfolder-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/createfolder-color.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:20px;
@@ -2256,7 +2256,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     font-weight: bold;
 }
 #rl-app #V-MailFolderList .buttonContacts {
-    background-image: url('images/contact.svg');
+    background-image: url('/themes/Murena/snappymail/images/contact.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 18px;
@@ -2338,7 +2338,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 
 
 #rl-app #rl-right .dropdown-menu.show  li:nth-child(10) a::before {
-    background-image: url('images/createfolder.svg');
+    background-image: url('/themes/Murena/snappymail/images/createfolder.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2347,7 +2347,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right .dropdown-menu.show  li:nth-child(11) a::before,
 #rl-app #rl-right .b-message menu.dropdown-menu.right-edge.show .dividerbar:nth-of-type(2) li:nth-child(1) a::before {
-    background-image: url('images/archieve.svg');
+    background-image: url('/themes/Murena/snappymail/images/archieve.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2356,7 +2356,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-right .dropdown-menu.show  li:nth-child(12) a::before,
 #rl-app #rl-right .b-message menu.dropdown-menu.right-edge.show .dividerbar:nth-of-type(2) li:nth-child(2) a::before {
-    background-image: url('images/spam.svg');
+    background-image: url('/themes/Murena/snappymail/images/spam.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2367,7 +2367,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 #rl-app #rl-right .dropdown-menu.show  li:nth-child(14) a::before,
 #rl-app #rl-right .b-message menu.dropdown-menu.right-edge.show .dividerbar:nth-of-type(2) li:nth-child(4) a::before,
 #rl-app #rl-right .b-message menu.dropdown-menu.right-edge.show .dividerbar:nth-of-type(2) li:nth-child(5) a::before {
-    background-image: url('images/trash.svg');
+    background-image: url('/themes/Murena/snappymail/images/trash.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2397,7 +2397,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     padding:0 12px 0 5px;
 }
 #rl-app .messageTags #tags-dropdown-id {
-    background-image: url('images/tag.svg') !important;
+    background-image: url('/themes/Murena/snappymail/images/tag.svg') !important;
     background-position: center center !important;
     background-repeat: no-repeat  !important;
     height: 20px;
@@ -2415,7 +2415,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     line-height: 16px;
 }
 #rl-app #messageItem .bodySubHeader .showImages::before{
-    background-image: url('images/noimage.svg') !important;
+    background-image: url('/themes/Murena/snappymail/images/noimage.svg') !important;
     background-position: center center;
     background-repeat: no-repeat;
     height: 14px;
@@ -2423,7 +2423,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     color: transparent;
 }
 #rl-app #messageItem .b-text-part.html img[data-x-src]:not([src])::after{
-    background-image: url('images/noimage.svg');
+    background-image: url('/themes/Murena/snappymail/images/noimage.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 14px;
@@ -2438,7 +2438,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     opacity:0.8;
 }
 #rl-app #V-MailMessageView .messageView  span.infoParent{
-    background-image: url('images/info.svg');
+    background-image: url('/themes/Murena/snappymail/images/info.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 25px;
@@ -2452,7 +2452,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     color: #ffca48;
   }
 #rl-app .messageView .b-message-view-checked-helper::after{
-    background-image: url('images/mailselected.svg');
+    background-image: url('/themes/Murena/snappymail/images/mailselected.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 32px;
@@ -2511,7 +2511,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     color: var(--color-primary-element-text-grey);
 }
 #rl-content #V-Login .language-buttons .language-button{
-    background-image: url('images/language.svg');
+    background-image: url('/themes/Murena/snappymail/images/language.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2533,7 +2533,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     height:36px;
 }
 #rl-content .LoginView .descWrapper::before{
-    background-image: url('images/murena-mail.svg');
+    background-image: url('/themes/Murena/snappymail/images/murena-mail.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 48px;
@@ -2545,7 +2545,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 
 #rl-app #V-MailMessageList .messageListItem.unseen .senderParent::before{
-    background-image: url('images/greendot.svg');
+    background-image: url('/themes/Murena/snappymail/images/greendot.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 10px;
@@ -2575,7 +2575,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     font-size: 14px;
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(1) a::before{
-    background-image: url('images/date-descending.svg');
+    background-image: url('/themes/Murena/snappymail/images/date-descending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2584,7 +2584,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:""
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(2) a::before{
-    background-image: url('images/date-ascending.svg');
+    background-image: url('/themes/Murena/snappymail/images/date-ascending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2593,7 +2593,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:"";
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(3) a::before{
-    background-image: url('images/size-descending.svg');
+    background-image: url('/themes/Murena/snappymail/images/size-descending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2602,7 +2602,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:"";
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(4) a::before{
-    background-image: url('images/size-ascending.svg');
+    background-image: url('/themes/Murena/snappymail/images/size-ascending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2617,7 +2617,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:"";
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(7) a::before{
-    background-image: url('images/from-a-z-descending.svg');
+    background-image: url('/themes/Murena/snappymail/images/from-a-z-descending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2626,7 +2626,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:"";
 }
 #rl-app #V-MailMessageList #sort-list-dropdown-id li:nth-child(8) a::before{
-    background-image: url('images/from-a-z-ascending.svg');
+    background-image: url('/themes/Murena/snappymail/images/from-a-z-ascending.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2669,7 +2669,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     vertical-align: top;
 }
 #rl-app  #rl-popups #V-PopupsCompose #squire-toolgroup-targets button.btn:nth-child(3){
-    background-image: url('images/toolbar-folder.svg');
+    background-image: url('/themes/Murena/snappymail/images/toolbar-folder.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 36px;
@@ -2678,7 +2678,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     content:"";
 }
 #rl-app  #rl-popups #V-PopupsCompose #squire-toolgroup-targets button.btn:nth-child(2){
-    background-image: url('images/toolbar-photo.svg');
+    background-image: url('/themes/Murena/snappymail/images/toolbar-photo.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 36px;
@@ -2693,7 +2693,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     padding: 0 14px;
 }
 #rl-app #rl-popups #V-PopupsCompose .g-ui-user-select-none .btn.btn-success .icon-paper-plane{
-    background-image: url('images/send-icon.svg');
+    background-image: url('/themes/Murena/snappymail/images/send-icon.svg');
     background-position: center center;
     background-repeat: no-repeat;
     display: inline-block;
@@ -2707,7 +2707,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 
 }
 #rl-app #rl-popups #V-PopupsCompose .g-ui-user-select-none .btn.btn-danger.button-delete{
-    background-image: url('images/delete-black.svg');
+    background-image: url('/themes/Murena/snappymail/images/delete-black.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2722,7 +2722,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
    background: var(--color-primary-text);
 }
 #rl-app #rl-popups #V-PopupsCompose .pull-right .close{
-    background-image: url('images/cross.svg');
+    background-image: url('/themes/Murena/snappymail/images/cross.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2734,7 +2734,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     vertical-align: bottom;
 }
 #rl-app #rl-popups #V-PopupsCompose .pull-right .minimize-custom{
-    background-image: url('images/minimize.svg');
+    background-image: url('/themes/Murena/snappymail/images/minimize.svg');
     background-position: 10px 20px;
     background-repeat: no-repeat;
     height: 30px;
@@ -2748,7 +2748,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 
 #rl-app #V-PopupsCompose header .pull-right a.btn:nth-child(3){
-    background-image: url('images/compose-contact.svg');
+    background-image: url('/themes/Murena/snappymail/images/compose-contact.svg');
     background-position: center 11px;
     background-repeat: no-repeat;
     height: 18px;
@@ -2815,7 +2815,7 @@ html.rl-left-panel-disabled #rl-left .b-folders li a.selectable::before{
     padding-right: 24px;
 }
 html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.fontastic:nth-child(1){
-    background-image: url(images/back-outward.svg);
+    background-image: url('/themes/Murena/snappymail/images/back-outward.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 34px;
@@ -2853,7 +2853,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
 }
 #rl-app #V-PopupsNextcloudFiles #sm-nc-files-tree button[name="share-public"]::before,
 #rl-app #V-PopupsNextcloudFiles #sm-nc-files-tree button[name="share-internal"]::before{
-    background-image: url(images/public-attachment.svg);
+    background-image: url('/themes/Murena/snappymail/images/public-attachment.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2864,7 +2864,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     vertical-align: middle;
 }
 #rl-app #V-PopupsNextcloudFiles #sm-nc-files-tree button[name="select"]::before{
-    background-image: url(images/attach.svg);
+    background-image: url('/themes/Murena/snappymail/images/attach.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 22px;
@@ -2903,7 +2903,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     opacity: 1;
 }
 #rl-app #V-PopupsContacts .b-header-toolbar.g-ui-user-select-none .btn-toolbar .btn:nth-child(3){
-    background-image: url('images/delete-black.svg');
+    background-image: url('/themes/Murena/snappymail/images/delete-black.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2956,7 +2956,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     font-weight: 400;
 }
  #rl-app #V-SettingsPane .btn-toolbar .btn:nth-child(1)::before{
-    background-image: url('images/back-to-inbox.svg');
+    background-image: url('/themes/Murena/snappymail/images/back-to-inbox.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -2988,7 +2988,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     font-size: 16px;
  }
  #rl-app #V-Settings-Accounts .btn .icon-user-add {
-    background-image: url('images/account-blue.svg');
+    background-image: url('/themes/Murena/snappymail/images/account-blue.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:16px;
@@ -3026,7 +3026,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     padding-left:24px;
 }
 #rl-app #V-Settings-Accounts span.delete.fontastic{
-    background-image: url('images/delete-black.svg');
+    background-image: url('/themes/Murena/snappymail/images/delete-black.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height: 20px;
@@ -3044,7 +3044,7 @@ html.rl-left-panel-disabled #rl-left .b-footer.btn-toolbar .btn-group a.btn.font
     font-size: 16px;
 }
 #rl-app #rl-loading .icon-spinner{
-    background-image: url('images/loading-color.svg');
+    background-image: url('/themes/Murena/snappymail/images/loading-color.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:32px;
@@ -3092,7 +3092,7 @@ html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] {
     height: 70px;
 }
 #rl-app footer button.btn.buttonYes::before {
-    background-image: url('images/tick-btn.svg');
+    background-image: url('/themes/Murena/snappymail/images/tick-btn.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:14px;
@@ -3103,7 +3103,7 @@ html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] {
     border: none;
 }
 #rl-app footer button.btn.buttonNo::before {
-    background-image: url('images/cross-btn.svg');
+    background-image: url('/themes/Murena/snappymail/images/cross-btn.svg');
     background-position: center center;
     background-repeat: no-repeat;
     height:14px;