diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index 25f9d8797c..f724f39be7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -8,10 +8,11 @@
 
     <!-- actions -->
     <ul class="dropdown-menu umb-actions" role="menu" aria-labelledby="dLabel">
-        <li class="action" ng-class="{sep:action.seperator}" ng-repeat="action in actions">
+        <li class="umb-action" ng-class="{sep:action.seperator}" ng-repeat="action in actions">
 
             <!-- How does this reference executeMenuItem() i really don't think that this is very clear -->
             <a prevent-default
+                class="umb-action-link"
                 ng-click="executeMenuItem(action)">
                 <i class="icon icon-{{action.cssclass}}"></i>
                 <span class="menu-label">{{action.name}}</span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index 45ac201c15..b287d68b94 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -12,7 +12,7 @@
 
             <li class="umb-action" data-element="action-create-{{docType.alias}}" ng-repeat="docType in allowedTypes | orderBy:'name':false">
                 <a class="umb-action-link" ng-click="createOrSelectBlueprintIfAny(docType)">
-                    <i class="large {{docType.icon}}"></i>
+                    <i class="large icon {{docType.icon}}"></i>
                     <span class="menu-label">
                         {{docType.name}}
                         <small>
@@ -27,7 +27,7 @@
 
             <li class="umb-action" ng-repeat="(key, value) in docType.blueprints | orderBy:'name':false">
                 <a class="umb-action-link" ng-click="createFromBlueprint(key)">
-                    <i class="large {{docType.icon}}"></i>
+                    <i class="large icon {{docType.icon}}"></i>
                     <span class="menu-label">
                         {{value}}
                     </span>
@@ -36,7 +36,7 @@
             
             <li class="umb-action sep" ng-show="allowBlank">
                 <a class="umb-action-link" ng-click="createBlank(docType)">
-                    <i class="large {{docType.icon}}"></i>
+                    <i class="large icon {{docType.icon}}"></i>
                     <span class="menu-label">
                         <localize key="blueprints_blankBlueprint">Blank</localize>
                     </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 7d04dfa771..ab14eac784 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -10,9 +10,9 @@
             <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
             <ul class="umb-actions umb-actions-child">
-                <li ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <a href="" ng-click="vm.createBlueprint(documentType)" prevent-default>
-                        <i class="large {{documentType.icon}}"></i>
+                <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
+                    <a href="" class="umb-action-link" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                        <i class="large icon {{documentType.icon}}"></i>
                         <span class="menu-label">
                             {{documentType.name}}
                             <small>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
index b50e1bba98..e17a7d98f0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html
@@ -4,17 +4,17 @@
         <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">           
-            <li data-element="action-data-type">
-                <a href="" ng-click="createDataType()" umb-auto-focus>
-                    <i class="large icon-autofill"></i>
+            <li data-element="action-data-type" class="umb-action">
+                <a href="" class="umb-action-link" ng-click="createDataType()" umb-auto-focus>
+                    <i class="large icon icon-autofill"></i>
                     <span class="menu-label">
                         <localize key="create_newDataType">New data type</localize>
                     </span>
                 </a>
             </li>
-            <li data-element="action-folder">
-                <a href="" ng-click="showCreateFolder()">
-                    <i class="large icon-folder"></i>
+            <li data-element="action-folder" class="umb-action">
+                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <i class="large icon icon-folder"></i>
                     <span class="menu-label">
                         <localize key="create_newFolder">New folder</localize>
                     </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 98f9b23b64..917e9147a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -4,40 +4,35 @@
         <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">
-            <li data-element="action-documentType" ng-hide="model.disableTemplates">
-                <a href="" ng-click="createDocType()" umb-auto-focus>
-
-                    <i class="large icon-item-arrangement"></i>
-
+            <li data-element="action-documentType" class="umb-action" ng-hide="model.disableTemplates">
+                <a href="" ng-click="createDocType()" class="umb-action-link" umb-auto-focus>
+                    <i class="large icon icon-item-arrangement"></i>
                     <span class="menu-label">
                         <localize key="content_documentType">Document type</localize>
                     </span>
                 </a>
             </li>
-            <li data-element="action-documentTypeWithoutTemplate">
-                <a href="" ng-click="createComponent()">
-                    <i class="large icon-item-arrangement"></i>
-
+            <li data-element="action-documentTypeWithoutTemplate" class="umb-action">
+                <a href="" ng-click="createComponent()" class="umb-action-link">
+                    <i class="large icon icon-item-arrangement"></i>
                     <span class="menu-label">
                         <localize ng-if="model.disableTemplates == false" key="create_documentTypeWithoutTemplate"></localize>
                         <localize ng-if="model.disableTemplates == true" key="content_documentType">Document type></localize>
                     </span>
                 </a>
             </li>
-            <li data-element="action-documentTypeCollection">
-                <a href="" ng-click="showCreateDocTypeCollection()">
-
-                    <i class="large icon-thumbnail-list"></i>
-
+            <li data-element="action-documentTypeCollection" class="umb-action">
+                <a href="" ng-click="showCreateDocTypeCollection()" class="umb-action-link">
+                    <i class="large icon icon-thumbnail-list"></i>
                     <span class="menu-label">
                         Document Type Collection
                         <!--                        <localize key="content_documentType_collection">Document Type Collection</localize>-->
                     </span>
                 </a>
             </li>
-            <li data-element="action-folder" ng-if="model.allowCreateFolder">
-                <a href="" ng-click="showCreateFolder()">
-                    <i class="large icon-folder"></i>
+            <li data-element="action-folder" ng-if="model.allowCreateFolder" class="umb-action">
+                <a href="" ng-click="showCreateFolder()" class="umb-action-link">
+                    <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/create.html b/src/Umbraco.Web.UI.Client/src/views/media/create.html
index 4144f60594..08809e226f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/create.html
@@ -1,41 +1,38 @@
 <div class="umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Media.CreateController">
 	<div class="umb-pane">
 
-	<h5><localize key="create_createUnder">Create under</localize> {{currentNode.name}}</h5>
+		<h5><localize key="create_createUnder">Create under</localize> {{currentNode.name}}</h5>
 
-	<p class="abstract" ng-hide="allowedTypes">
-		<localize key="create_noMediaTypes" />
-	</p>
+		<p class="abstract" ng-hide="allowedTypes">
+			<localize key="create_noMediaTypes" />
+		</p>
 
-		<ul class="umb-actions">
-			<li class="action">
-				<ul class="umb-actions-child">
+		<ul class="umb-actions umb-actions-child">
 
-					<li data-element="action-{{docType.alias}}" ng-repeat="docType in allowedTypes">
-					    <a ng-href="" ng-click="createMediaItem(docType)" prevent-default>
-					        <i class="large {{docType.icon}}"></i>
-					        <span class="menu-label">
-	        		        	{{docType.name}}
-	        		            <small>{{docType.description}}</small>
-	        		        </span>
-					    </a>
-					</li>
-                    <!--
-					    <li class="add">
-					        <a href="#settings/documenttype/create/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
-					            <i class="icon-large icon-plus"></i>
-					            <span class="menu-label">
-					                Create a new media type
-					                <small>
-					                    Design and configure a new media type
-					                </small>
-					            </span>
-					        </a>
-					    </li>
-                    -->
-				</ul>
+			<li data-element="action-{{docType.alias}}" class="umb-action" ng-repeat="docType in allowedTypes">
+				<a ng-href="" ng-click="createMediaItem(docType)" class="umb-action-link" prevent-default>
+					<i class="large icon {{docType.icon}}"></i>
+					<span class="menu-label">
+						{{docType.name}}
+						<small>{{docType.description}}</small>
+					</span>
+				</a>
 			</li>
+			<!--
+				<li class="add">
+					<a href="#settings/documenttype/create/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
+						<i class="icon-large icon-plus"></i>
+						<span class="menu-label">
+							Create a new media type
+							<small>
+								Design and configure a new media type
+							</small>
+						</span>
+					</a>
+				</li>
+			-->
 		</ul>
+
 	</div>
 </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
index afcb1ef787..ca85bcbf9e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
@@ -4,18 +4,18 @@
         <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">           
-            <li>
-                <a href="" ng-click="createMediaType()" umb-auto-focus>
-                    <i class="large icon-item-arrangement"></i>
+            <li class="umb-action">
+                <a href="" class="umb-action-link" ng-click="createMediaType()" umb-auto-focus>
+                    <i class="large icon icon-item-arrangement"></i>
                     <span class="menu-label">
                         <localize key="general_new">New</localize>
                         <localize key="content_mediatype">Media type</localize>
                     </span>
                 </a>
             </li>
-            <li>
-                <a href="" ng-click="showCreateFolder()">
-                    <i class="large icon-folder"></i>
+            <li class="umb-action">
+                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html
index eeadc03447..e448583cdb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html
@@ -4,9 +4,9 @@
         <h5><localize key="member_createNewMember">Create a new member</localize></h5>
         <ul class="umb-actions umb-actions-child">
 
-            <li ng-repeat="docType in allowedTypes">
-                <a href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
-                    <i class="large {{docType.icon}}"></i>
+            <li class="umb-action" ng-repeat="docType in allowedTypes">
+                <a class="umb-action-link" href="#member/member/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true" ng-click="nav.hideNavigation()">
+                    <i class="large icon {{docType.icon}}"></i>
                     <span class="menu-label">
                         {{docType.name}}
                         <small>{{docType.description}}</small>
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
index cd9de7a4a5..00662cb29a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html
@@ -4,16 +4,16 @@
         <h5><localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">
-            <li>
-                <a href="" ng-click="showCreateFolder()">
-                    <i class="large icon-folder"></i>
+            <li class="umb-action">
+                <a href="" class="umb-action-link" ng-click="showCreateFolder()">
+                    <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>
-            <li>
-                <a href="" ng-click="createMemberType()">
+            <li class="umb-action">
+                <a href="" class="umb-action-link" ng-click="createMemberType()">
 
-                    <i class="large icon-item-arrangement"></i>
+                    <i class="large icon icon-item-arrangement"></i>
 
                     <span class="menu-label">
                         <localize key="general_new">New</localize>&nbsp;
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index febaaab646..b7fcf00bba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -10,27 +10,27 @@
                 <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
                 <ul class="umb-actions umb-actions-child">
-                    <li>
-                        <a href="" ng-click="vm.createFile()" umb-auto-focus>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.createFile()" umb-auto-focus>
                             <i class="large icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacro">New partial view macro</localize></span>
                         </a>
                     </li>
-                    <li>
-                        <a href="" ng-click="vm.createFileWithoutMacro()">
-                            <i class="large icon-article"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.createFileWithoutMacro()">
+                            <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroNoMacro">New partial view macro (without macro)</localize></span>
                         </a>
                     </li>
-                    <li>
-                        <a href="" ng-click="vm.showCreateFromSnippet()">
-                            <i class="large icon-article"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">>New partial view macro from snippet</localize></span>
                         </a>
                     </li>
-                    <li>
-                        <a href="" ng-click="vm.showCreateFolder()">
-                            <i class="large icon-folder"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                            <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize></span>
                         </a>
                     </li>
@@ -43,9 +43,9 @@
                 <h5><localize key="defaultdialogs_selectSnippet">Select snippet</localize></h5>
 
                 <ul class="umb-actions umb-actions-child">
-                    <li ng-repeat="snippet in vm.snippets">
-                        <a href="" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
-                            <i class="icon-article" style="font-size: 20px;"></i>
+                    <li class="umb-action" ng-repeat="snippet in vm.snippets">
+                        <a href="" class="umb-action-link" ng-click="vm.createFileFromSnippet(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
                         </a>
                     </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index 7dc4268ce1..4ca34379e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -9,21 +9,21 @@
             <!-- Main options -->
             <div ng-if="!vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
-                    <li>
-                        <a href="" ng-click="vm.createPartialView()" umb-auto-focus>
-                            <i class="large icon-article"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.createPartialView()" umb-auto-focus>
+                            <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
                         </a>
                     </li>
-                    <li>
-                        <a href="" ng-click="vm.showCreateFromSnippet()">
-                            <i class="large icon-article"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon icon-article"></i>
                             <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize></span>
                         </a>
                     </li>
-                    <li>
-                        <a href="" ng-click="vm.showCreateFolder()">
-                            <i class="large icon-folder"></i>
+                    <li class="umb-action">
+                        <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                            <i class="large icon icon-folder"></i>
                             <span class="menu-label"><localize key="general_folder"></localize></span>
                         </a>
                     </li>
@@ -33,9 +33,9 @@
             <!-- Snippets list -->
             <div ng-if="vm.showSnippets">
                 <ul class="umb-actions umb-actions-child">
-                    <li ng-repeat="snippet in vm.snippets">
-                        <a href="" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
-                            <i class="icon-article" style="font-size: 20px;"></i>
+                    <li class="umb-action" ng-repeat="snippet in vm.snippets">
+                        <a href="" class="umb-action-link" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article icon" style="font-size: 20px;"></i>
                             <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
                         </a>
                     </li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index ff52a50e70..296ea2fc72 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -16,7 +16,7 @@
                            <localize key="actions_create">Create</localize>
                            <span class="caret"></span>
                        </a>
-                       <umb-dropdown class="umb-actions" ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
+                       <umb-dropdown ng-if="page.createDropdownOpen" on-close="page.createDropdownOpen = false">
                             <umb-dropdown-item ng-repeat="contentType in listViewAllowedTypes track by contentType.key | orderBy:'name':false">
                                 <a ng-href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
                                     {{::contentType.name}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index f7d8b0382d..cd5272b5e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -4,15 +4,15 @@
         <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">
-            <li>
-                <a href="" umb-auto-focus ng-click="vm.createFile()">
-                    <i class="large icon-script"></i>
+            <li class="umb-action">
+                <a href="" class="umb-action-link" umb-auto-focus ng-click="vm.createFile()">
+                    <i class="large icon icon-script"></i>
                     <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
                 </a>
             </li>
-            <li>
-                <a href="" ng-click="vm.showCreateFolder()">
-                    <i class="large icon-folder"></i>
+            <li class="umb-action">
+                <a href="" class="umb-action-link" ng-click="vm.showCreateFolder()">
+                    <i class="large icon icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>
                 </a>
             </li>