diff --git a/style.css b/style.css
index 07d6694781d3a4c7a4c33e36a57eea627b228e06..f8890f1d2e13185dd311b483d22a33d9e7c7a3de 100644
--- a/style.css
+++ b/style.css
@@ -198,6 +198,7 @@
     --svg-opacity: 0.6;
     --svg-color-blue: #087BF9;
     --invertfilter:invert(0);
+    --color-primary-drop:rgba(0, 0, 0, 0.12);
 }
 
 body.theme--dark {
@@ -345,6 +346,7 @@ body.theme--dark {
     --svg-opacity: 0.74;
     --svg-color-blue: #087BF9;
     --invertfilter:invert(1);
+    --color-primary-drop:rgba(255, 255, 255, 0.04);
 }
 
 
@@ -703,9 +705,10 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     font-size: var(--default-font-size);
     font-weight: 400;
 }
-#rl-app .btn-toolbar .btn {
+#rl-app #V-MailMessageView .btn-toolbar .btn {
     background-color: transparent;
     border: none;
+    padding: 8px 14px;
 }
 #rl-app .btn.btn-thin {
     padding-right: 9px;
@@ -1020,7 +1023,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 .b-folders .b-content {
     padding: 0;
 }
-.rl-side-preview-pane #rl-app #V-MailMessageList {
+.sm-msgview-side #rl-app #V-MailMessageList {
     min-width: 360px;
     overflow: hidden;
 }
@@ -1053,6 +1056,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
 }
 #rl-app #rl-content .btn.buttonCompose .buttonComposeText {
     padding-bottom: 2px;
+    color:var( --color-primary-element-text) !important;
 }
 #rl-app #rl-content .b-folders-system li .flag-icon {
     display: none;
@@ -1175,7 +1179,7 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
 #rl-app #rl-right {
     border-top: 1px solid var(--color-border-grey);
 }
-.rl-side-preview-pane #rl-app #V-MailMessageList .btn-toolbar {
+.sm-msgView-side #rl-app #V-MailMessageList .btn-toolbar {
     text-align: right;
     border-bottom: 1px solid var(--color-border-grey);
 }
@@ -1187,7 +1191,7 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
     padding-left: 20px;
     padding-right: 19px;
 }
-#rl-app #V-MailMessageList .btn-toolbar a.btn:nth-child(1) .icon-spinner {
+#rl-app #V-MailMessageList .btn-toolbar a.btn[data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD"] .icon-spinner {
     background-image: var(--spinner-icon);
     background-position: center center;
     background-repeat: no-repeat;
@@ -1949,8 +1953,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
  * account selector
  */
 
-    #rl-app .btn-toolbar.g-ui-user-select-none {
-        border: solid 1px var(--color-border-dark);
+    #rl-app #V-SystemDropDown .btn-toolbar.g-ui-user-select-none {
         border-radius: var(--border-radius-large);
         height: 36px;
         padding: 2px;
@@ -1958,36 +1961,42 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         flex-direction: row;
         align-items: center;
         box-sizing: content-box;
-        background-color: var(--color-primary-text);
+        background-color: var(--color-primary-drop);
     }
 
-    #rl-app #V-SystemDropDown .btn-toolbar.g-ui-user-select-none {
+    #rl-app #V-MailMessageView .btn-toolbar.g-ui-user-select-none {
         border: none;
 
     }
+
+
     #rl-app #V-SystemDropDown .accountPlace {
-        background: var(--background-email);
+        background: transparent;
         color: var(--color-email-text);
         text-shadow: none;
         font-weight: 400;
         font-size: 14px;
         height: 32px;
+        line-height: 32px;
+        padding: 0 8px;
+        border-right: 0;
     }
     #rl-app #V-SystemDropDown .btn-toolbar.g-ui-user-select-none .btn-group.dropdown {
         height: 32px;
-        margin-left: 8px;
+        margin: 8px;
     }
 
     #rl-app #V-SystemDropDown .btn-toolbar #top-system-dropdown-id {
-        background: var(--color-background-black);
+        background:transparent;
         border-radius: 8px;
         height: 32px;
         min-height: 32px;
-        padding: 2px 5px 5px 10px;
+        padding: 0;
+        display: table;
     }
 
 
-    #rl-app #V-SystemDropDown #top-system-dropdown-id .fontastic:nth-child(1) {
+    #rl-app #V-SystemDropDown #top-system-dropdown-id i.fontastic {
         color: transparent;
         mask-image: var(--profilesetting);
         mask-position: center center;
@@ -2005,11 +2014,12 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         background-position: center center;
         background-repeat: no-repeat;
         padding-left: 10px;
+        display: table-cell;
     }
 
     #rl-app #V-SystemDropDown #top-system-dropdown-id:hover,
     #rl-app #V-SystemDropDown #top-system-dropdown-id:focus {
-        background-color: var(--color-background-dark);
+        background-color: transparent;
     }
 
     #rl-app #V-SystemDropDown #top-system-dropdown-id:active {
@@ -2345,6 +2355,9 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         width: 24px;
         color: transparent;
     }
+    #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show .dividerbar:nth-of-type(2){
+        display:none
+    }
     #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/CONTACTS"]::before {
         content: "";
         mask-image: var(--contactmail);
@@ -2442,7 +2455,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         width: 24px;
         color: transparent;
     }
-    #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li:has(a[data-i18n="GLOBAL/LOGOUT"]) {
+    #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show .dividerbar ~ .dividerbar {
         display: none;
     }
     #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/LOGOUT"] {
@@ -2470,7 +2483,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     #rl-app #rl-right #V-MailMessageList .btn-toolbar .btn-group i.fontastic {
         display: none;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(1) a.btn.disabled {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn.disabled[data-i18n="[title]GLOBAL/MOVE_TO"] {
         mask-image: var(--createfolder);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2483,7 +2496,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(1) a.btn {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn[data-i18n="[title]GLOBAL/MOVE_TO"] {
         mask-image: var(--createfolder);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2496,7 +2509,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.disabled:nth-child(1) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn.disabled[data-i18n="[title]GLOBAL/TO_ARCHIVE"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn.disabled[data-i18n="[title]GLOBAL/TO_ARCHIVE"] {
         mask-image: var(--archieve);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2509,7 +2523,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn:nth-child(1) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn[data-i18n="[title]GLOBAL/TO_ARCHIVE"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn[data-i18n="[title]GLOBAL/TO_ARCHIVE"] {
         mask-image: var(--archieve);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2522,7 +2537,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic.disabled:nth-child(2) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn.disabled[data-i18n="[title]GLOBAL/SPAM"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn.disabled[data-i18n="[title]GLOBAL/SPAM"] {
         mask-image: var(--spam);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2535,7 +2551,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic:nth-child(2) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn[data-i18n="[title]GLOBAL/SPAM"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn[data-i18n="[title]GLOBAL/SPAM"] {
         mask-image: var(--spam);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2548,7 +2565,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic.disabled:nth-child(4) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn.disabled[data-i18n="[title]GLOBAL/DELETE"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn.disabled[data-i18n="[title]GLOBAL/DELETE"] {
         mask-image: var(--trash);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2561,7 +2579,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(2) a.btn.fontastic:nth-child(4) {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar a.btn[data-i18n="[title]GLOBAL/DELETE"],
+    #rl-app #rl-right #V-MailMessageView .btn-toolbar.g-ui-user-select-none .btn-group a.btn[data-i18n="[title]GLOBAL/DELETE"] {
         mask-image: var(--trash);
         mask-position: center center;
         mask-repeat: no-repeat;
@@ -2574,7 +2593,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: transparent;
         width: 50px;
     }
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(3) #more-list-dropdown-id,
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar #more-list-dropdown-id[data-i18n="[title]GLOBAL/MORE"],
     #rl-app #more-view-dropdown-id {
         mask-image: var(--more) !important;
         mask-position: center center !important;
@@ -2589,7 +2608,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         width: 50px;
     }
 
-    #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(4) #sort-list-dropdown-id {
+    #rl-app #rl-right #V-MailMessageList .btn-toolbar #sort-list-dropdown-id[data-i18n="[title]MESSAGE_LIST/SORT"] {
         mask-image: var(--sort) !important;
         mask-position: center center !important;
         mask-repeat: no-repeat !important;
@@ -2951,6 +2970,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: var(--color-primary-element-text);
         margin-right: 10px;
         border-radius: 6px;
+        background: var(--color-primary-element-text-blue);
     }
 
     #V-PopupsContacts .b-view-content-toolbar.btn-toolbar .btn.button-save-contact,
@@ -2997,7 +3017,6 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         color: var(--color-text-dark-second);
         font-weight: 400;
         font-size: 24px;
-        margin-top: 15px;
         border-top: 1px solid var(--color-border-grey);
         border-radius: 0;
     }
@@ -3308,7 +3327,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     }
 
     #rl-app .rl-mobile .messageListItem .flagParent,
-    #rl-app .rl-side-preview-pane .messageListItem .flagParent {
+    #rl-app .sm-msgview-side .messageListItem .flagParent {
         display: none;
     }
     #rl-app #V-PopupsNextcloudFiles #sm-nc-files-tree button.button-vue {
@@ -3401,10 +3420,12 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         position: relative;
         padding-top: 0;
     }
+    html.sm-msgView-side #V-MailMessageView .top-toolbar{
+        visibility: hidden;
+    }
     #rl-app #V-PopupsContacts .left {
         width: 30%;
     }
-    #rl-app #V-Settings-General .form-horizontal .legend:nth-child(1),
     #rl-app #V-SettingsMenu .b-footer {
         border-top: 1px solid var(--color-border-compose);
         border-bottom: none;
@@ -3413,9 +3434,6 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         border-top: 1px solid var(--color-border-compose);
     }
 
-    #rl-app #V-Settings-General .form-horizontal .legend {
-        border-bottom: none;
-    }
     #rl-app #V-SettingsPane #rl-settings-subscreen {
         padding: 0;
     }
@@ -3580,10 +3598,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     #rl-app #V-PopupsCompose .pull-right .dropdown {
         width: 30px;
     }
-    #rl-app .rl-side-preview-pane #V-MailMessageList .resizer {
-        margin-top: 58px;
-    }
-    .rl-side-preview-pane #V-MailMessageList .resizer {
+    .sm-msgview-side #V-MailMessageList .resizer {
         margin-top: 58px;
     }
     html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] {
@@ -3698,11 +3713,14 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     #rl-app #V-PopupsCompose .emailaddresses .emailaddresses-input {
         margin: 0;
     }
-
+    #rl-app .btn {
+        background: none;
+    }
     #rl-app .btn[data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD"] {
         width: 50px;
         text-align: center;
         padding: 0;
+        background: transparent;
     }
     #rl-app .e-paginator a.current {
         font-size: 22px;
@@ -3727,7 +3745,6 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         padding-right: 0;
     }
     #rl-app .messageView .messageItemHeader {
-        margin-top: 15px;
         border-top: 1px solid var(--color-border-grey);
         border-radius: 0;
         border-bottom: none;
@@ -3790,7 +3807,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         vertical-align: middle;
         line-height: 20px;
     }
-    .rl-side-preview-pane #rl-app #V-MailMessageList .messageList {
+    .sm-msgview-side #rl-app #V-MailMessageList .messageList {
         overflow: hidden;
         min-width: 359px;
     }
@@ -3936,9 +3953,6 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     #rl-app .messageView .messageItemHeader .subjectParent {
         padding-bottom: 16px;
     }
-    #rl-app .messageView .message-fixed-button-toolbar {
-        top: 50px;
-    }
     /* #rl-app #messageItem table,
     #rl-app #messageItem table tr td img {
         filter:var(--invertfilter);
@@ -3994,8 +4008,8 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
         text-align: left;
         margin-left: 40px;
     }
-    #rl-app #V-Settings-General .form-horizontal .control-group > :not(label),
-    #rl-app #V-Settings-Contacts .form-horizontal .control-group > :not(label){
+    #rl-app #V-Settings-General .form-horizontal .control-group >:not(label),
+    #rl-app #V-Settings-Contacts .form-horizontal .control-group >:not(label) {
         margin-left: 40px;
     }
     #rl-app #V-Settings-Security .form-horizontal .control-group > label {
@@ -4005,3 +4019,14 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
     #rl-app #V-Settings-Security details .legend {
         padding-left: 0;
     }
+    #rl-app #messageItem .attachmentsPlace .attachmentItem .iconPreview{
+        display: block;
+    }
+    #rl-app #messageItem .attachmentsPlace .attachmentItem .icon-file-text::before{
+        display: none;
+    }
+    #rl-app #V-SettingsPane {
+        border:none;
+        box-shadow:none;
+        background-color: var(--color-main-background);
+    }