diff --git a/images/loading.svg b/images/loading.svg
index cd4d4e4d0df1ed61480b3b65f5a6552cb6a9c84f..7828cd01a1a80a6d1190a0658b8ab9afc20d819d 100644
--- a/images/loading.svg
+++ b/images/loading.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.6449 2.35C12.1949 0.9 10.2049 0 7.99488 0C3.57488 0 0.00488281 3.58 0.00488281 8C0.00488281 12.42 3.57488 16 7.99488 16C11.7249 16 14.8349 13.45 15.7249 10H13.6449C12.8249 12.33 10.6049 14 7.99488 14C4.68488 14 1.99488 11.31 1.99488 8C1.99488 4.69 4.68488 2 7.99488 2C9.65488 2 11.1349 2.69 12.2149 3.78L8.99488 7H15.9949V0L13.6449 2.35Z" fill="black" fill-opacity="0.6"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.6449 6.35C16.1949 4.9 14.2049 4 11.9949 4C7.57488 4 4.00488 7.58 4.00488 12C4.00488 16.42 7.57488 20 11.9949 20C15.7249 20 18.8349 17.45 19.7249 14H17.6449C16.8249 16.33 14.6049 18 11.9949 18C8.68488 18 5.99488 15.31 5.99488 12C5.99488 8.69 8.68488 6 11.9949 6C13.6549 6 15.1349 6.69 16.2149 7.78L12.9949 11H19.9949V4L17.6449 6.35Z" fill="black" fill-opacity="0.6"/>
 </svg>
diff --git a/images/profilesetting.svg b/images/profilesetting.svg
index 9dbb1c88f1d4bf707a00b2c290e68d636c199a2b..e7c493974319ebeeb11aece7293f6ed4d70351f9 100644
--- a/images/profilesetting.svg
+++ b/images/profilesetting.svg
@@ -1,5 +1,5 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.08496 14.5V13.85C2.08496 13.51 2.24496 13.19 2.49496 13.04C4.18496 12.03 6.11496 11.5 8.08496 11.5C8.11496 11.5 8.13496 11.5 8.16496 11.51C8.26496 10.81 8.46496 10.14 8.75496 9.53C8.53496 9.51 8.31496 9.5 8.08496 9.5C5.66496 9.5 3.40496 10.17 1.47496 11.32C0.594961 11.84 0.0849609 12.82 0.0849609 13.85V16.5H9.34496C8.92496 15.9 8.59496 15.22 8.37496 14.5H2.08496Z" fill="black" fill-opacity="0.6"/>
-<path d="M8.08496 8.5C10.295 8.5 12.085 6.71 12.085 4.5C12.085 2.29 10.295 0.5 8.08496 0.5C5.87496 0.5 4.08496 2.29 4.08496 4.5C4.08496 6.71 5.87496 8.5 8.08496 8.5ZM8.08496 2.5C9.18496 2.5 10.085 3.4 10.085 4.5C10.085 5.6 9.18496 6.5 8.08496 6.5C6.98496 6.5 6.08496 5.6 6.08496 4.5C6.08496 3.4 6.98496 2.5 8.08496 2.5Z" fill="black" fill-opacity="0.6"/>
-<path d="M18.835 12.5C18.835 12.28 18.805 12.08 18.775 11.87L19.915 10.86L18.915 9.13L17.465 9.62C17.145 9.35 16.785 9.14 16.385 8.99L16.085 7.5H14.085L13.785 8.99C13.385 9.14 13.025 9.35 12.705 9.62L11.255 9.13L10.255 10.86L11.395 11.87C11.365 12.08 11.335 12.28 11.335 12.5C11.335 12.72 11.365 12.92 11.395 13.13L10.255 14.14L11.255 15.87L12.705 15.38C13.025 15.65 13.385 15.86 13.785 16.01L14.085 17.5H16.085L16.385 16.01C16.785 15.86 17.145 15.65 17.465 15.38L18.915 15.87L19.915 14.14L18.775 13.13C18.805 12.92 18.835 12.72 18.835 12.5ZM15.085 14.5C13.985 14.5 13.085 13.6 13.085 12.5C13.085 11.4 13.985 10.5 15.085 10.5C16.185 10.5 17.085 11.4 17.085 12.5C17.085 13.6 16.185 14.5 15.085 14.5Z" fill="black" fill-opacity="0.6"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.08496 17.5V16.85C4.08496 16.51 4.24496 16.19 4.49496 16.04C6.18496 15.03 8.11496 14.5 10.085 14.5C10.115 14.5 10.135 14.5 10.165 14.51C10.265 13.81 10.465 13.14 10.755 12.53C10.535 12.51 10.315 12.5 10.085 12.5C7.66496 12.5 5.40496 13.17 3.47496 14.32C2.59496 14.84 2.08496 15.82 2.08496 16.85V19.5H11.345C10.925 18.9 10.595 18.22 10.375 17.5H4.08496Z" fill="black" fill-opacity="0.6"/>
+<path d="M10.085 11.5C12.295 11.5 14.085 9.71 14.085 7.5C14.085 5.29 12.295 3.5 10.085 3.5C7.87496 3.5 6.08496 5.29 6.08496 7.5C6.08496 9.71 7.87496 11.5 10.085 11.5ZM10.085 5.5C11.185 5.5 12.085 6.4 12.085 7.5C12.085 8.6 11.185 9.5 10.085 9.5C8.98496 9.5 8.08496 8.6 8.08496 7.5C8.08496 6.4 8.98496 5.5 10.085 5.5Z" fill="black" fill-opacity="0.6"/>
+<path d="M20.835 15.5C20.835 15.28 20.805 15.08 20.775 14.87L21.915 13.86L20.915 12.13L19.465 12.62C19.145 12.35 18.785 12.14 18.385 11.99L18.085 10.5H16.085L15.785 11.99C15.385 12.14 15.025 12.35 14.705 12.62L13.255 12.13L12.255 13.86L13.395 14.87C13.365 15.08 13.335 15.28 13.335 15.5C13.335 15.72 13.365 15.92 13.395 16.13L12.255 17.14L13.255 18.87L14.705 18.38C15.025 18.65 15.385 18.86 15.785 19.01L16.085 20.5H18.085L18.385 19.01C18.785 18.86 19.145 18.65 19.465 18.38L20.915 18.87L21.915 17.14L20.775 16.13C20.805 15.92 20.835 15.72 20.835 15.5ZM17.085 17.5C15.985 17.5 15.085 16.6 15.085 15.5C15.085 14.4 15.985 13.5 17.085 13.5C18.185 13.5 19.085 14.4 19.085 15.5C19.085 16.6 18.185 17.5 17.085 17.5Z" fill="black" fill-opacity="0.6"/>
 </svg>
diff --git a/styles.css b/styles.css
index e0b3541d46d802cf36c8bb085a74ebb70bb7359b..6d4f0053c86933c816396aa6baf6237d8e841448 100644
--- a/styles.css
+++ b/styles.css
@@ -292,7 +292,7 @@ html.rl-left-panel-disabled #rl-app #rl-left{
     height: 58px;
     display: flex;
     flex-direction: row;
-    padding: 8px;
+    padding: 10px 8px 10px 17px;
     border-top:1px solid var(--color-border-grey);
     border-bottom:1px solid var(--color-border-grey);
 }
@@ -469,14 +469,22 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     color: var(--color-primary-element);
     font-weight: 700;
     font-size: 14px;
-    height: 14px;
+    padding: 0px 15px 0 4px;
+    height: 56px;
+    vertical-align: middle;
+    display: inline-block;
+    line-height: 56px;
 }
 #rl-app .b-folders .b-folders-system a[data-unread].selectable::after{
     background-color: transparent;
     color: var(--color-primary-element-text-grey);
     font-weight: 700;
     font-size: 14px;
-    height: 14px;
+    padding: 0px 15px 0 4px;
+    height: 56px;
+    vertical-align: middle;
+    display: inline-block;
+    line-height: 56px;
 }
 #rl-app .b-folders hr {
     border-bottom: 1px solid var(--color-border-grey);
@@ -805,9 +813,7 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     flex-direction: row;
     justify-content: center;
     align-items: center;
-    padding: 12px 16px;
-    width: 173px;
-    height: 32px;
+    width: 150px;
     background:  var(--color-primary-element-text-blue);
     border-radius: 6px;
     flex: none;
@@ -824,6 +830,9 @@ html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar {
     height:20px;
     image-rendering: -webkit-optimize-contrast;
   }
+  #rl-app #rl-content .btn.buttonCompose .buttonComposeText {
+    padding-bottom: 2px;
+ }
 #rl-app #rl-content .b-folders-system li .flag-icon{
     display:none;
 }
@@ -959,12 +968,12 @@ html.rl-left-panel-disabled #rl-app .b-footer.btn-toolbar .btn-group .btn.icon-f
     background-image: url('images/loading.svg');
     background-position: center center;
     background-repeat: no-repeat;
-    height:20px;
-    padding-left: 20px;
-    padding-right: 19px;
+    width: 24px;
+    height: 36px;
     content: "";
     color: transparent;
     border: none;
+    vertical-align: middle;
 }
 /* #rl-app #V-MailMessageList .btn-toolbar a.btn:nth-child(1) .icon-spinner{
     display: none;
@@ -1156,7 +1165,8 @@ select option {
 }
 
 #rl-app .messageList .b-footer {
-    padding-bottom: 10px;
+    padding-top: 12px;
+    padding-bottom: 2px;
 }
 
 #rl-app .messageList .second-toolbar,
@@ -1738,7 +1748,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     border-radius: 8px;
     height:32px;
     min-height: 32px;
-    padding: 5px;
+    padding: 2px 5px 5px 10px;
 }
 
 
@@ -1919,6 +1929,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 
 #rl-app #V-PopupsCompose .b-header {
     background:var(--color-main-background);
+    padding-left: 0px;
 }
 #rl-app #V-PopupsCompose .b-header table{
     border-collapse: unset;
@@ -1939,12 +1950,18 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
  #rl-app #V-PopupsCompose .btn-group:nth-of-type(1)  button.btn:nth-child(1) .icon-file-text {
    vertical-align: middle;
    height: 19px;
+   display: block;
  }
  #rl-app #V-PopupsCompose .btn-group:nth-of-type(1)  button.btn:nth-child(2)  {
     background: var(--color-main-background);
     border: 1px solid var(--color-border-second) !important;
     border-radius: 0px 4px 4px 0px;
-    height:35px;
+    height:32px;
+ }
+ #rl-app #V-PopupsCompose .btn-group:nth-of-type(1)  button.btn:nth-child(2) .icon-attachment  {
+    line-height: 16px;
+    vertical-align: middle;
+    display: block;
  }
  #rl-app #V-PopupsCompose .btn-group:nth-of-type(1)  button.btn.active {
     background: rgba(0, 0, 0, 0.12);
@@ -1964,7 +1981,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-image: url('images/attachnextcloud-files.svg');
     background-position: center center;
     background-repeat: no-repeat;
-    height:35px;
+    height:32px;
+    min-height:32px;
     color:transparent;
     border-radius: 0px 4px 4px 0px;
  }
@@ -1981,7 +1999,12 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     line-height: 33px;
     padding: 0px 12px;
  }
- #rl-app #V-PopupsCompose #squire-toolgroup-mode .btn:nth-child(1),  #rl-app #V-PopupsCompose #squire-toolgroup-font .btn:nth-child(2){
+ #rl-app #V-PopupsCompose #squire-toolgroup-mode .btn:nth-child(1){
+    width:85px;
+    vertical-align: baseline;
+    padding: 0px 24px;
+ }
+#rl-app #V-PopupsCompose #squire-toolgroup-font .btn:nth-child(2){
     width:71px;
     vertical-align: baseline;
  }
@@ -2014,8 +2037,12 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     padding-left: 10px;
  }
 #rl-app .squire-toolbar {
+    border-bottom: 1px solid var(--border-color,#ddd);
     height: 50px;
     box-sizing: content-box;
+    padding-top:0px;
+    padding-bottom:0px;
+    padding-left: 16px;
 }
 #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show{
     background: var(--color-main-background);
@@ -2101,10 +2128,12 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #V-PopupsCompose header{
     background-color: var(--color-primary-text);
+    padding-left:16px;
 }
 #rl-app #V-PopupsCompose header .button-save{
     background: var(--color-background-black);
-    padding-left: 7px;
+    height: auto;
+    padding: 0 14px 0 7px;
 }
 #rl-app #V-PopupsCompose header .close,
 #rl-app #V-PopupsCompose header .minimize-custom {
@@ -2120,6 +2149,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     color:transparent;
+    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');
@@ -2127,6 +2157,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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) {
     background-image: url('images/archieve.svg');
@@ -2134,6 +2165,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     color:transparent;
+    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');
@@ -2141,6 +2173,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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) {
     background-image: url('images/spam.svg');
@@ -2148,6 +2181,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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) {
     background-image: url('images/spam.svg');
@@ -2155,6 +2189,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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) {
     background-image: url('images/trash.svg');
@@ -2162,6 +2197,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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) {
     background-image: url('images/trash.svg');
@@ -2169,6 +2205,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height:18px;
     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 #more-view-dropdown-id {
     background-image: url('images/more.svg') !important;
@@ -2176,6 +2213,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat !important;
     height:18px;
     color:transparent;
+    width: 50px;
 }
 
 #rl-app #rl-right #V-MailMessageList .btn-toolbar div.btn-group:nth-of-type(4) #sort-list-dropdown-id {
@@ -2185,6 +2223,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     height:18px;
     color:transparent;
     order: 1;
+    width: 50px;
 }
 #rl-app #rl-content .select,#rl-app #rl-content input,#rl-app #rl-content select,#rl-app #rl-popups select,#rl-app #rl-popups input{
     height:34px;
@@ -2220,6 +2259,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-repeat: no-repeat;
     height: 18px;
     color:transparent;
+    padding: 4px 14px 4px 0px;
+    margin-left:20px;
 }
 #rl-app #rl-right .dropdown-menu.show  li a {
     text-align:left;
@@ -2351,7 +2392,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 
 }
 #rl-app #V-PopupsCompose .emailaddresses{
-    padding:0 12px;
+    padding:0 12px 0 5px;
 }
 #rl-app .messageTags #tags-dropdown-id {
     background-image: url('images/tag.svg') !important;
@@ -2646,12 +2687,16 @@ 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-success{
     background: var(--color-success-second);
     border-radius: 6px;
+    height: auto;
+    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-position: center center;
     background-repeat: no-repeat;
-    height: 21px;
+    display: inline-block;
+    line-height: 36px;
+    height: 36px;
     width: 14px;
     color: transparent;
     content:"";
@@ -2715,7 +2760,9 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
 }
 #rl-app #rl-popups #V-PopupsCompose .btn-group:nth-of-type(1) button.btn.active{
     background:var(--color-border-second);
-    height: 35px;
+    height: 32px;
+    padding: unset;
+    width: 41px;
 }
 #rl-app #rl-popups #V-PopupsCompose .b-header.g-ui-user-select-none .error-to::before {
     border: 1px solid var(--color-error-second);
@@ -3063,9 +3110,14 @@ html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] {
 #rl-app #V-PopupsCompose .btn-group:nth-of-type(3) a.btn.fontastic:nth-child(1){
     padding-top:5px;
     border-radius: 4px 0px 0px 4px;
+    font-size: 14px;
+    height: 32px;
+    min-height: 32px;
+    line-height: 20px;
+    vertical-align: middle;
 }
 #rl-app #rl-popups #V-PopupsCompose #squire-toolgroup-changes .btn[data-action="source"] {
-    height: 36px;
+    height: auto;
 }
 #rl-app #V-PopupsCompose .btn-group:nth-of-type(1) button.btn:nth-child(1){
     border-radius: 4px 0px 0px 4px;
@@ -3078,4 +3130,49 @@ html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] {
 }
 #rl-app #rl-popups #V-PopupsCompose #squire-toolgroup-targets .btn,#rl-app #rl-popups #V-PopupsCompose #squire-toolgroup-targets .btn{
     height:36px;
+}
+#rl-app .hide-mobile[data-i18n="COMPOSE/BUTTON_SEND"] {
+    display: inline-block;
+    height: auto;
+    line-height: 36px;
+    vertical-align: middle;
+}
+#rl-app .hide-mobile[data-i18n="GLOBAL/SAVE"] {
+    display: inline-block;
+    height: auto;
+    line-height: 36px;
+}
+#rl-app .squire-wysiwyg{
+    margin-top:0px;
+    border:none;
+}
+#rl-app label[data-i18n="GLOBAL/TO"] ,
+ #rl-app #V-PopupsCompose .b-header td[data-i18n="GLOBAL/FROM"],
+ #rl-app #V-PopupsCompose .b-header td[data-i18n="GLOBAL/SUBJECT"]
+{
+    text-align: left;
+    padding-left: 16px;
+    color:var( --color-text-dark-second);
+}
+#rl-app .squire-toolbar {
+    padding-left: 16px;
+}
+#rl-app #area-toggle {
+    padding-left: 16px;
+}
+#rl-app #V-PopupsCompose .emailaddresses .emailaddresses-input input
+{
+    padding-left: 0px;
+}
+#rl-app #V-PopupsCompose .emailaddresses .emailaddresses-input{
+    margin: 0 0;
+}
+
+#rl-app .btn[data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD"]{
+    width: 50px;
+    text-align: center;
+    padding: 0;
+}
+#rl-app .e-paginator a.current{
+    font-size:22px;
 }
\ No newline at end of file