diff --git a/src/app/components/shared/footer/footer.component.html b/src/app/components/shared/footer/footer.component.html
index a78872ae9afb1f31d61a09720c71eeada7551622..b0e049f93067f04ed99f8a55fa4a7ed5686a5527 100644
--- a/src/app/components/shared/footer/footer.component.html
+++ b/src/app/components/shared/footer/footer.component.html
@@ -49,19 +49,14 @@
       </span>
     </button>
 
-    <mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false">
-      <button
-        *ngFor="let theme of themes"
-        (click)="changeTheme(theme);"
-        matRipple [matRippleColor]="'rgba(0,0,0,0.1)'"
-        title="{{theme.toString(getLanguage())}}"
-        aria-label="test">
+    <mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false" cdkTrapFocus>
+      <button *ngFor="let theme of themes" mat-menu-item style="height:50px;" (click)="changeTheme(theme)">
         <div class="btnContent">
           <div class="btnColorIcon" [ngStyle]="{
-                  'background-color':theme.getPreviewColor()}">
+'background-color':theme.getPreviewColor()}">
             <div class="checked" [ngClass]="{
-                        'checked_true':theme.key===themeClass,
-                        'checked_false':theme.key!==themeClass}">
+'checked_true':theme.key===themeClass,
+'checked_false':theme.key!==themeClass}">
               <mat-icon [ngStyle]="{'color':theme.getOnPreviewColor()}">
                 checked
               </mat-icon>
diff --git a/src/app/components/shared/footer/footer.component.scss b/src/app/components/shared/footer/footer.component.scss
index 05b8d234b26261f5c839f3e989a1d167fdda728b..b6d171f095e8eedbd6f1b5fce046ff041ed46cf7 100644
--- a/src/app/components/shared/footer/footer.component.scss
+++ b/src/app/components/shared/footer/footer.component.scss
@@ -167,8 +167,7 @@ mat-icon {
   width:calc( 100% - 50px );
   float:right;
   position:relative;
-  top:50%;
-  transform:translateY(-50%);
+  top:-10px;
 }
 
 .btnContent>.btnAppend>.title{