diff --git a/src/app/components/analysis-panel/analysis-panel.component.html b/src/app/components/analysis-panel/analysis-panel.component.html
index 7d433bfbd9e5661cf4b83edf08aa5ea5498af11a..6d6245ab6ce7b37c1c8df6c2b4fd6e99ee5de6db 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.html
+++ b/src/app/components/analysis-panel/analysis-panel.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="token">
-  <div class="card analysis" [ngClass]="{'fullscreen': fullscreen}">
+  <div class="card analysis" [ngClass]="{ fullscreen: fullscreen }">
     <header class="card-header">
       <p class="card-header-title">
         <span class="icon">
@@ -21,19 +21,6 @@
         </span>
       </a>
 
-      <a
-        (click)="close()"
-        class="card-header-icon"
-        aria-label="close"
-        pTooltip="Close analysis"
-        [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
-        tooltipPosition="left"
-      >
-        <span class="icon" title="Close analysis">
-          <i class="fas fa-times color-danger" aria-hidden="true"></i>
-        </span>
-      </a>
-
       <a
         pTooltip="Open in fullscreen"
         [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
@@ -47,7 +34,9 @@
         </span>
       </a>
       <a
-        title="close fullscreen"
+        pTooltip="Close fullscreen"
+        [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
+        tooltipPosition="left"
         *ngIf="fullscreen"
         (click)="toggleFullscreen()"
         class="card-header-icon"
@@ -56,6 +45,19 @@
           <i class="fas fa-compress"></i>
         </span>
       </a>
+
+      <a
+        (click)="close()"
+        class="card-header-icon"
+        aria-label="close"
+        pTooltip="Close analysis"
+        [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
+        tooltipPosition="left"
+      >
+        <span class="icon" title="Close analysis">
+          <i class="fas fa-times color-danger" aria-hidden="true"></i>
+        </span>
+      </a>
     </header>
     <div
       class="card-content tab-header-small"