diff --git a/pom.xml b/pom.xml
index cd04332..d8d26f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
         <plugins>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-jira-plugin</artifactId>
+                <artifactId>jira-maven-plugin</artifactId>
                 <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
@@ -192,15 +192,8 @@
                     <productDataVersion>${jira.version}</productDataVersion>
                     <log4jProperties>src/aps/resources/log4j.properties</log4jProperties>
                     <enableFastdev>false</enableFastdev>
-
-                    <pluginArtifacts>
-                        <pluginArtifact>
-                            <groupId>com.atlassian.labs.plugins</groupId>
-                            <artifactId>quickreload</artifactId>
-                            <version>${quick.reload.version}</version>
-                        </pluginArtifact>
-                    </pluginArtifacts>
-
+                    <enableQuickReload>true</enableQuickReload>
+                    <allowGoogleTracking>false</allowGoogleTracking>
                     <products>
                         <product>
                             <id>jira</id>
@@ -209,13 +202,6 @@
                     </products>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -248,14 +234,7 @@
                         </dependency>
                     </scannedDependencies>
                     <verbose>false</verbose>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <includeExclude>-com.atlassian.plugin.spring.scanner.annotation.*</includeExclude>
                 </configuration>
             </plugin>
         </plugins>
@@ -263,19 +242,20 @@
 
     <properties>
         <jira.version>7.2.0</jira.version>
-        <amps.version>6.2.6</amps.version>
+        <amps.version>8.0.2</amps.version>
         <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
         <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <testkit.version>6.3.11</testkit.version>
-        <quick.reload.version>1.30.5</quick.reload.version>
-
         <jira.test.version>7.2.0</jira.test.version>
         <jira.data.version>7.2.0</jira.data.version>
         <jira.rest.version>3.0.8</jira.rest.version>
         <atlas.template.version>3.0.0</atlas.template.version>
         <atlas.concurrent.version>3.0.0</atlas.concurrent.version>
         <atlas.sal.version>3.0.5</atlas.sal.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <profiles>
diff --git a/src/main/resources/templates/gerrit-reviews-agile-panel.vm b/src/main/resources/templates/gerrit-reviews-agile-panel.vm
index 27b9728..8d8b0d3 100644
--- a/src/main/resources/templates/gerrit-reviews-agile-panel.vm
+++ b/src/main/resources/templates/gerrit-reviews-agile-panel.vm
@@ -92,15 +92,15 @@
     <div class="twixi-block collapsed">
         <div class="twixi-wrap concise">
             <a href="#" class="twixi">
-                <span class="icon twixi-closed">
+                <span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
                     <span>Show</span>
                 </span>
             </a>
             $i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed)
         </div>
 
-        <div class="verbose">
-            <span class="twixi icon twixi-opened">
+        <div class="twixi-wrap verbose">
+            <span class="twixi icon-default aui-icon aui-icon-small aui-iconfont-expanded">
                 <span>Hide</span>
             </span>
             <span>
diff --git a/src/main/resources/templates/gerrit-reviews-side-panel.vm b/src/main/resources/templates/gerrit-reviews-side-panel.vm
index ea192af..11ee83e 100644
--- a/src/main/resources/templates/gerrit-reviews-side-panel.vm
+++ b/src/main/resources/templates/gerrit-reviews-side-panel.vm
@@ -92,15 +92,15 @@
     <div class="twixi-block collapsed">
         <div class="twixi-wrap concise">
             <a href="#" class="twixi">
-                <span class="icon twixi-closed">
+                <span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
                     <span>Show</span>
                 </span>
             </a>
             $i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed)
         </div>
 
-        <div class="verbose">
-            <span class="twixi icon twixi-opened">
+        <div class="twixi-wrap verbose">
+            <span class="twixi icon-default aui-icon aui-icon-small aui-iconfont-expanded">
                 <span>Hide</span>
             </span>
             <span>
diff --git a/src/main/resources/templates/gerrit-reviews-tabpanel-item.vm b/src/main/resources/templates/gerrit-reviews-tabpanel-item.vm
index e71b9f9..6412c95 100644
--- a/src/main/resources/templates/gerrit-reviews-tabpanel-item.vm
+++ b/src/main/resources/templates/gerrit-reviews-tabpanel-item.vm
@@ -68,7 +68,7 @@
     ## The concise version:
     <div class="actionContainer twixi-wrap concise">
         <a href="#" class="twixi">
-            <span class="icon twixi-closed">
+            <span class="icon-default aui-icon aui-icon-small aui-iconfont-collapsed">
                 <span>Show</span>
             </span>
         </a>
@@ -82,7 +82,7 @@
     ## The verbose version:
     <div class="actionContainer twixi-wrap verbose">
         <a href="#" class="twixi">
-            <span class="icon twixi-opened">
+            <span class="icon-default aui-icon aui-icon-small aui-iconfont-expanded">
                 <span>Hide</span>
             </span>
         </a>