diff --git a/app/azure/components/azure-sidebar-content/azureSidebarContent.html b/app/azure/components/azure-sidebar-content/azureSidebarContent.html
index 01986e8e7..811ab7837 100644
--- a/app/azure/components/azure-sidebar-content/azureSidebarContent.html
+++ b/app/azure/components/azure-sidebar-content/azureSidebarContent.html
@@ -2,5 +2,5 @@
   <a ui-sref="azure.dashboard" ui-sref-active="active">Dashboard <span class="menu-icon fa fa-tachometer-alt fa-fw"></span></a>
 </li>
 <li class="sidebar-list">
-  <a ui-sref="azure.containerinstances" ui-sref-active="active">Container instances <span class="menu-icon fa fa-server fa-fw"></span></a>
+  <a ui-sref="azure.containerinstances" ui-sref-active="active">Container instances <span class="menu-icon fa fa-cubes fa-fw"></span></a>
 </li>
diff --git a/app/azure/views/containerinstances/containerinstances.html b/app/azure/views/containerinstances/containerinstances.html
index 6c0223852..cfa2337c9 100644
--- a/app/azure/views/containerinstances/containerinstances.html
+++ b/app/azure/views/containerinstances/containerinstances.html
@@ -11,7 +11,7 @@
   <div class="col-sm-12">
     <containergroups-datatable
       title-text="Containers"
-      title-icon="fa-server"
+      title-icon="fa-cubes"
       dataset="containerGroups"
       table-key="containergroups"
       order-by="Name"
diff --git a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
index c5aec5434..50815d41d 100644
--- a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
+++ b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
@@ -11,7 +11,7 @@
   <a ui-sref="docker.services" ui-sref-active="active">Services <span class="menu-icon fa fa-list-alt fa-fw"></span></a>
 </li>
 <li class="sidebar-list">
-  <a ui-sref="docker.containers" ui-sref-active="active">Containers <span class="menu-icon fa fa-server fa-fw"></span></a>
+  <a ui-sref="docker.containers" ui-sref-active="active">Containers <span class="menu-icon fa fa-cubes fa-fw"></span></a>
 </li>
 <li class="sidebar-list">
   <a ui-sref="docker.images" ui-sref-active="active">Images <span class="menu-icon fa fa-clone fa-fw"></span></a>
@@ -20,7 +20,7 @@
   <a ui-sref="docker.networks" ui-sref-active="active">Networks <span class="menu-icon fa fa-sitemap fa-fw"></span></a>
 </li>
 <li class="sidebar-list">
-  <a ui-sref="docker.volumes" ui-sref-active="active">Volumes <span class="menu-icon fa fa-cubes fa-fw"></span></a>
+  <a ui-sref="docker.volumes" ui-sref-active="active">Volumes <span class="menu-icon fa fa-hdd fa-fw"></span></a>
 </li>
 <li class="sidebar-list" ng-if="$ctrl.endpointApiVersion >= 1.3 && $ctrl.swarmManagement">
   <a ui-sref="docker.configs" ui-sref-active="active">Configs <span class="menu-icon fa fa-file-code fa-fw"></span></a>
diff --git a/app/docker/views/containers/containers.html b/app/docker/views/containers/containers.html
index b1ba1e791..46ba65e4e 100644
--- a/app/docker/views/containers/containers.html
+++ b/app/docker/views/containers/containers.html
@@ -11,7 +11,7 @@
   <div class="col-sm-12" ng-if="containers">
     <containers-datatable
       title-text="Containers"
-      title-icon="fa-server"
+      title-icon="fa-cubes"
       dataset="containers"
       table-key="containers"
       order-by="Status"
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index 41d8349f3..506336170 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -284,7 +284,7 @@
 <div class="row" ng-if="container.Mounts.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-cubes" title-text="Volumes"></rd-widget-header>
+      <rd-widget-header icon="fa-hdd" title-text="Volumes"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <thead>
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html
index 59c6e44d2..e42c49874 100644
--- a/app/docker/views/dashboard/dashboard.html
+++ b/app/docker/views/dashboard/dashboard.html
@@ -112,7 +112,7 @@
       <rd-widget>
         <rd-widget-body>
           <div class="widget-icon blue pull-left">
-            <i class="fa fa-server"></i>
+            <i class="fa fa-cubes"></i>
           </div>
           <div class="pull-right" style="padding-left: 5px;">
             <div><i class="fa fa-power-off space-right green-icon"></i>{{ containers | runningcontainers }} running</div>
@@ -149,7 +149,7 @@
       <rd-widget>
         <rd-widget-body>
           <div class="widget-icon blue pull-left">
-            <i class="fa fa-cubes"></i>
+            <i class="fa fa-hdd"></i>
           </div>
           <div class="title">{{ volumeCount }}</div>
           <div class="comment">{{ volumeCount === 1 ? 'Volume' : 'Volumes' }}</div>
diff --git a/app/docker/views/volumes/edit/volume.html b/app/docker/views/volumes/edit/volume.html
index d55d317be..d3f4daad5 100644
--- a/app/docker/views/volumes/edit/volume.html
+++ b/app/docker/views/volumes/edit/volume.html
@@ -101,7 +101,7 @@
 <div class="row" ng-if="containersUsingVolume.length > 0">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
-      <rd-widget-header icon="fa-server" title-text="Containers using volume"></rd-widget-header>
+      <rd-widget-header icon="fa-cubes" title-text="Containers using volume"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <thead>
diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html
index f3c860390..a2d18159a 100644
--- a/app/docker/views/volumes/volumes.html
+++ b/app/docker/views/volumes/volumes.html
@@ -11,7 +11,7 @@
   <div class="col-sm-12">
     <volumes-datatable
       title-text="Volumes"
-      title-icon="fa-cubes"
+      title-icon="fa-hdd"
       dataset="volumes"
       table-key="volumes"
       order-by="Id"
diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
index de88bfa12..fa67430e5 100644
--- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
@@ -42,7 +42,7 @@
               {{ $ctrl.model.Snapshots[0].ServiceCount === 1 ? 'service' : 'services' }}
             </span>
             <span style="padding: 0 7px 0 7px;">
-              <i class="fa fa-server space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount }}
+              <i class="fa fa-cubes space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount }}
               {{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount === 1 ? 'container' : 'containers' }}
               <span ng-if="$ctrl.model.Snapshots[0].RunningContainerCount > 0 || $ctrl.model.Snapshots[0].StoppedContainerCount > 0">
                 -
@@ -54,7 +54,7 @@
               </span>
             </span>
             <span style="padding: 0 7px 0 7px;">
-              <i class="fa fa-cubes space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].VolumeCount }}
+              <i class="fa fa-hdd space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].VolumeCount }}
               {{ $ctrl.model.Snapshots[0].VolumeCount === 1 ? 'volume' : 'volumes' }}
             </span>
             <span style="padding: 0 7px 0 7px;">
diff --git a/app/portainer/components/forms/template-form/templateForm.html b/app/portainer/components/forms/template-form/templateForm.html
index fc911fa0b..12bff3e7b 100644
--- a/app/portainer/components/forms/template-form/templateForm.html
+++ b/app/portainer/components/forms/template-form/templateForm.html
@@ -46,7 +46,7 @@
             <input type="radio" id="template_container" ng-model="$ctrl.model.Type" ng-value="1" />
             <label for="template_container">
               <div class="boxselector_header">
-                <i class="fa fa-server" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px;"></i>
                 Container
               </div>
               <p>Container template</p>
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index 74d2765e3..17fe4869c 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -150,7 +150,7 @@
   <div class="col-sm-12">
     <containers-datatable
       title-text="Containers"
-      title-icon="fa-server"
+      title-icon="fa-cubes"
       dataset="containers"
       table-key="stack-containers"
       order-by="Status"