diff --git a/src/components/panelmenu/PanelMenuSub.vue b/src/components/panelmenu/PanelMenuSub.vue
index bc304e924..86eece038 100755
--- a/src/components/panelmenu/PanelMenuSub.vue
+++ b/src/components/panelmenu/PanelMenuSub.vue
@@ -72,7 +72,7 @@ export default {
         },
         getSubmenuIcon(item) {
             const active = this.isActive(item);
-            return ['p-panelmenu-icon pi pi-fw', {'pi-caret-right': !active, 'pi-caret-down': active}];
+            return ['p-panelmenu-icon pi pi-fw', {'pi-angle-right': !active, 'pi-angle-down': active}];
         },
         visible(item) {
             return (typeof item.visible === 'function' ? item.visible() : item.visible !== false);
diff --git a/src/components/tree/TreeNode.vue b/src/components/tree/TreeNode.vue
index 587cc94ba..a4473a60f 100755
--- a/src/components/tree/TreeNode.vue
+++ b/src/components/tree/TreeNode.vue
@@ -289,8 +289,8 @@ export default {
         },
         toggleIcon() {
             return ['p-tree-toggler-icon pi pi-fw', {
-                'pi-caret-down': this.expanded,
-                'pi-caret-right': !this.expanded
+                'pi-angle-down': this.expanded,
+                'pi-angle-right': !this.expanded
             }];
         },
         checkboxClass() {
diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue
index 7f0db83b9..519c09c7c 100755
--- a/src/components/treetable/TreeTable.vue
+++ b/src/components/treetable/TreeTable.vue
@@ -18,7 +18,7 @@
                 <slot name="paginatorRight"></slot>
             </template>
         </TTPaginator>
-        <div class="p-treetable-tablewrapper">
+        <div class="p-treetable-wrapper">
             <table ref="table">
                 <thead class="p-treetable-thead">
                     <tr>
@@ -921,7 +921,7 @@ export default {
     table-layout: auto;
 }
 
-.p-treetable-hoverable-rows .p-treetable-row {
+.p-treetable-hoverable-rows .p-treetable-tbody > tr {
     cursor: pointer;
 }
 
diff --git a/src/components/treetable/TreeTableRow.vue b/src/components/treetable/TreeTableRow.vue
index 1a08777ae..42105ab5d 100755
--- a/src/components/treetable/TreeTableRow.vue
+++ b/src/components/treetable/TreeTableRow.vue
@@ -13,7 +13,7 @@
                 </div>
             </div>
             <TTColumnSlot :node="node" :column="col" type="body" v-if="col.$scopedSlots.body" />
-            <template v-else>{{resolveFieldData(node.data, col.field)}}</template>
+            <template>{{resolveFieldData(node.data, col.field)}}</template>
         </td>
     </tr>
 </template>
@@ -218,7 +218,7 @@ export default {
             return (this.selectionMode && this.selectionKeys) ? this.selectionKeys[this.node.key] === true : false;
         },
         togglerIcon() {
-            return ['p-treetable-toggler-icon pi', {'pi-chevron-right': !this.expanded, 'pi-chevron-down': this.expanded}];
+            return ['p-treetable-toggler-icon pi', {'pi-angle-right': !this.expanded, 'pi-angle-down': this.expanded}];
         },
         togglerStyle() {
             return {