diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb3b213da..227703bcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ All notable changes to AET will be documented in this file.
 - [PR-385](https://github.com/Cognifide/aet/pull/385) Fixed ChefDK and vagrant-berkshelf versions
 - [PR-404](https://github.com/Cognifide/aet/pull/404) Added missing tooltip for conditional tests
 
+- [PR-408](https://github.com/Cognifide/aet/pull/408) Advanced Screen Comparision button layout fix
+
 ## Version 3.1.0
 
 - [PR-409](https://github.com/Cognifide/aet/pull/409) Added sources link in "view source" url
diff --git a/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html b/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
index dc6ab3e13..95e604c42 100644
--- a/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
+++ b/report/src/main/webapp/app/layout/main/url/reports/screen_layout.html
@@ -30,11 +30,11 @@
     </div>
     <span ng-if="case.comparator.stepResult.data.excludeMessage" class="checkboxes-inline">Exclude info: {{case.comparator.stepResult.data.excludeMessage}}</span>
   </div>
-  <div class="advanced-screen-comparison button button-small button-blue">
-  <a ng-if="case.status == 'FAILED' || case.status == 'CONDITIONALLY_PASSED'" data-ng-click="advancedScreenComparison()" data-aet-compare-screens>Advanced Screen Comparison</a>
-  </div>
   <div class="toolbar-blocks">
     <div class="toolbar-btns pull-right">
+      <div class="advanced-screen-comparison button button-small button-blue">
+        <a ng-if="case.status == 'FAILED' || case.status == 'CONDITIONALLY_PASSED'" data-ng-click="advancedScreenComparison()" data-aet-compare-screens>Advanced Screen Comparison</a>
+      </div>
       <ng-include src="'app/layout/main/url/navigation/navigation.comments.html'"/>
       <ng-include src="'app/layout/main/url/navigation/navigation.patternButtons.html'"/>
     </div>
diff --git a/report/src/main/webapp/assets/sass/_newComparison.scss b/report/src/main/webapp/assets/sass/_newComparison.scss
index 947e711fe..ca84156ab 100644
--- a/report/src/main/webapp/assets/sass/_newComparison.scss
+++ b/report/src/main/webapp/assets/sass/_newComparison.scss
@@ -17,8 +17,8 @@
  */
 
 .advanced-screen-comparison {
-  display: inline-block;
-  vertical-align: middle;
+  margin-top: 3px;
+  margin-right: 20px;
   a {
     color: $white;
   }
diff --git a/report/src/main/webapp/assets/sass/_toolbar.scss b/report/src/main/webapp/assets/sass/_toolbar.scss
index 09695d408..aa2deb669 100644
--- a/report/src/main/webapp/assets/sass/_toolbar.scss
+++ b/report/src/main/webapp/assets/sass/_toolbar.scss
@@ -229,6 +229,7 @@
   display: block;
   line-height: 44px;
   cursor: pointer;
+  margin-right: 10px;
 
   &.small {
     line-height: 37px;