diff --git a/include/class.nav.php b/include/class.nav.php
index ac8c0228cc1f1bbce9236777dea180f30285b294..89f47ed75e1cd46ef75a95016e5ab019cea024a5 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -208,8 +208,8 @@ class AdminNav extends StaffNav{
                     $subnav[]=array('desc'=>'SLA Plans','href'=>'slas.php','iconclass'=>'sla');
                     $subnav[]=array('desc'=>'API Keys','href'=>'apikeys.php','iconclass'=>'api');
                     $subnav[]=array('desc'=>'Pages', 'href'=>'pages.php','title'=>'Pages','iconclass'=>'pages');
-                    $subnav[]=array('desc'=>'Forms','href'=>'forms.php','iconclass'=>'pages');
-                    $subnav[]=array('desc'=>'Lists','href'=>'lists.php','iconclass'=>'pages');
+                    $subnav[]=array('desc'=>'Forms','href'=>'forms.php','iconclass'=>'forms');
+                    $subnav[]=array('desc'=>'Lists','href'=>'lists.php','iconclass'=>'lists');
                     break;
                 case 'emails':
                     $subnav[]=array('desc'=>'Emails','href'=>'emails.php', 'title'=>'Email Addresses', 'iconclass'=>'emailSettings');
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 0b4a8e154aeb6a9641fababb4a2c3eab838e67e5..0990da7c2a6e5489e7c987ac1ce69f23de8b8b3c 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -2,7 +2,7 @@
  <h2>Custom Forms</h2>
 </div>
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
- <b><a href="forms.php?a=add" class="Icon">Add New Custom Form</a></b></div>
+ <b><a href="forms.php?a=add" class="Icon form-add">Add New Custom Form</a></b></div>
 <div class="clear"></div>
 
 <?php
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index 67510792d37bc39ef4b4e5218536fa4f52bd7d0e..2baf9f81a7bc54ea1869ad64f84985985c5708e9 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -2,7 +2,7 @@
  <h2>Custom Lists</h2>
 </div>
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
- <b><a href="lists.php?a=add" class="Icon">Add New Custom List</a></b></div>
+ <b><a href="lists.php?a=add" class="Icon list-add">Add New Custom List</a></b></div>
 <div class="clear"></div>
 
 <?php
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index 4e5fc2cee7e1f21bd2931ca0405ff6ce8622cbfc..0fd53146f7e986b754f48e565476dffcf0dbbe18 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -136,7 +136,6 @@ $(function() {
                 'imageGetJson': 'ajax.php/draft/images/browse',
                 'syncBeforeCallback': captureImageSizes
             };
-        console.log(el.data('redactor'));
         if (el.data('redactor')) return;
         if (el.hasClass('draft')) {
             var reset = $('input[type=reset]', el.closest('form')),
diff --git a/scp/css/scp.css b/scp/css/scp.css
index ae4a0229be2ae425eafe5fd26e9ec98b2f59eb16..557f03442b14d53f3ecb72d18207125acc3a337b 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -295,6 +295,9 @@ a.newDepartment { background:url(../images/icons/new_department.gif) }
 a.pages { background:url(../images/icons/pages.gif) }
 a.newPage { background:url(../images/icons/new_page.gif) }
 
+a.forms { background:url(../images/icons/icon-form.png); background-size: 16px 16px; }
+a.lists { background:url(../images/icons/icon-list.png); background-size: 16px 16px; }
+
 /* Generic CSS based Icons. use=> <tag class="Icon iconname">text</tag> */
 
 .Icon {
@@ -302,6 +305,8 @@ a.newPage { background:url(../images/icons/new_page.gif) }
     padding-left:20px;
     background-position: left center;
     background-repeat: no-repeat;
+    min-height: 16px;
+    display: inline-block;
 }
 
 
@@ -352,6 +357,8 @@ a.Icon:hover {
 .Icon.alertLog { background:url(../images/icons/log_alert.gif) 0 2px no-repeat; }
 .Icon.errorLog { background:url(../images/icons/log_error.gif) 0 2px no-repeat; }
 
+.Icon.form-add { background:url(../images/icons/icon-form-add.png) 0 0 no-repeat; background-size: 16px 16px; }
+.Icon.list-add { background:url(../images/icons/icon-list-add.png) 0 0 no-repeat; background-size: 16px 16px; }
 
 
 #content {
diff --git a/scp/images/icons/icon-form-add.png b/scp/images/icons/icon-form-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..55a300f10b9f8ccccd1bc7f8005f03aa9cc03634
Binary files /dev/null and b/scp/images/icons/icon-form-add.png differ
diff --git a/scp/images/icons/icon-form.png b/scp/images/icons/icon-form.png
new file mode 100644
index 0000000000000000000000000000000000000000..810092eeab835eb478442b5971cc92f4a4b0e7e0
Binary files /dev/null and b/scp/images/icons/icon-form.png differ
diff --git a/scp/images/icons/icon-list-add.png b/scp/images/icons/icon-list-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..425e949d33bd31f44e49feffa45fee319e46af32
Binary files /dev/null and b/scp/images/icons/icon-list-add.png differ
diff --git a/scp/images/icons/icon-list.png b/scp/images/icons/icon-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b6ac133d500da5c83c7f97cb07d26ce96d9d736
Binary files /dev/null and b/scp/images/icons/icon-list.png differ