diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index d7a0b34d8..1c008801e 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -79,6 +79,7 @@ class e_form
 
 	public function __construct($enable_tabindex = false)
 	{
+		e107::loadAdminIcons(); // required below.
 		e107_include_once(e_LANGUAGEDIR.e_LANGUAGE. '/lan_form_handler.php');
 		$this->_tabindex_enabled = $enable_tabindex;
 		$this->_uc = e107::getUserClass();
diff --git a/e107_tests/tests/unit/e_formTest.php b/e107_tests/tests/unit/e_formTest.php
index e9b299946..b14122c82 100644
--- a/e107_tests/tests/unit/e_formTest.php
+++ b/e107_tests/tests/unit/e_formTest.php
@@ -160,9 +160,9 @@ class e_formTest extends \Codeception\Test\Unit
 			$this->assertTrue(false, "Couldn't load e_form object");
 		}
 
+		e107::loadAdminIcons();
 		e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');
 		e107::includeLan(e_PLUGIN.'forum/languages/English/English_front.php');
-		e107::loadAdminIcons();
 
 		include_once(e_PLUGIN.'forum/forum_class.php');
 		require_once(e_PLUGIN.'forum/templates/forum_icons_template.php');
diff --git a/e107_tests/tests/unit/e_navigationTest.php b/e107_tests/tests/unit/e_navigationTest.php
index f4832f436..43a736a59 100644
--- a/e107_tests/tests/unit/e_navigationTest.php
+++ b/e107_tests/tests/unit/e_navigationTest.php
@@ -4,24 +4,10 @@
 	class e_navigationTest extends \Codeception\Test\Unit
 	{
 
-		/** @var e_navigation */
-		/*
-		protected $ep;
-
 		protected function _before()
 		{
-
-			try
-			{
-				$this->ep = $this->make('e_navigation');
-			}
-
-			catch(Exception $e)
-			{
-				$this->assertTrue(false, $e->getMessage());
-			}
-
-		}*/
+			e107::loadAdminIcons();
+		}
 /*
 		public function testCompile()
 		{
diff --git a/e107_tests/tests/unit/scriptsTest.php b/e107_tests/tests/unit/scriptsTest.php
index 65967fb03..ab0e91eb2 100644
--- a/e107_tests/tests/unit/scriptsTest.php
+++ b/e107_tests/tests/unit/scriptsTest.php
@@ -11,6 +11,8 @@
 			{
 				define("SEP", " <span class='fa fa-angle-double-right e-breadcrumb'></span> ");
 			}
+
+			e107::loadAdminIcons();
 		}
 
 		public function testAdminScripts()