diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index ad7e06092c71734c0459aed3b61638a6a10cae6f..123d873c2d1e5a9a7418e6ef89b2d67326a01256 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -78,7 +78,7 @@ public class AccountController extends BaseController
 		{
 			final StringBuffer requestURL = request.getRequestURL();
 			final String baseUrl = requestURL.substring(0, requestURL.length() - request.getRequestURI().length());
-			referer = baseUrl + "/transactions/";
+			referer = baseUrl + "/transactions";
 		}
 
 		if(referer.contains(ACCOUNT_SELECTED_INDICATOR))
diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
index db0caf5d670647315471f9d2ca8991b20293d273..e8e2c572e912a1d1717d5061af17ec31d2db11d2 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/helpers/iconSelect.ftl
@@ -79,14 +79,14 @@
 
     <#assign hasImageIcon=item.getIconReference()?? && item.getIconReference().isImageIcon()/>
     <#if hasImageIcon>
-        <#assign selectedImageID=item.getIconReference().getImage().getID()?c/>
+        <#assign availableImagesUrl='/media/getAvailableImages/' + item.getIconReference().getImage().getID()?c/>
     <#else>
-        <#assign selectedImageID=""/>
+        <#assign availableImagesUrl='/media/getAvailableImages'/>
     </#if>
 
     <@progressIndicator/>
 
-    <div class="row" id="available-images" data-url="<@s.url '/media/getAvailableImages/' + selectedImageID/>">
+    <div class="row" id="available-images" data-url="<@s.url availableImagesUrl/>">
     </div>
 </#macro>
 
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
index 94cdcee3140d007fa23c7c4f255cae0903a27797..36d8594d185e846c5c987a837743458f367565ec 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/ChartTest.java
@@ -385,6 +385,7 @@ class ChartTest extends SeleniumTestBase
 
 		wait = new WebDriverWait(driver, Duration.ofSeconds(5));
 		wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("matchingTransactionsTitle")));
+		((JavascriptExecutor) driver).executeScript("arguments[0].scrollIntoView(true);", driver.findElement(By.id("matchingTransactionsTitle")));
 
 		assertThat(driver.findElements(By.className("search-result"))).hasSizeGreaterThan(0);
 	}