diff --git a/release/antos-1.2.1.tar.gz b/release/antos-1.2.1.tar.gz
index 87db5ca..1f7c1c2 100644
Binary files a/release/antos-1.2.1.tar.gz and b/release/antos-1.2.1.tar.gz differ
diff --git a/src/core/tags/FileViewTag.ts b/src/core/tags/FileViewTag.ts
index da85557..13bc4e2 100644
--- a/src/core/tags/FileViewTag.ts
+++ b/src/core/tags/FileViewTag.ts
@@ -468,7 +468,8 @@ namespace OS {
                             v.text = v.text.substring(0, 9) + "...";
                         }*/
                         v.iconclass = v.iconclass ? v.iconclass : v.type;
-                        v.icon = v.icon;
+                        if(v.icon)
+                            v.iconclass = undefined;
                         items.push(v);
                     });
                     (this.refs.listview as ListViewTag).data = items;
@@ -489,7 +490,10 @@ namespace OS {
                         }
                         if(!v.text)
                             v.text = v.filename;
+                        
                         v.iconclass = v.iconclass ? v.iconclass : v.type;
+                        if(v.icon)
+                            v.iconclass = undefined;
                         const row = [
                             v,
                             {
@@ -550,7 +554,8 @@ namespace OS {
                             v.open = false;
                         }
                         v.iconclass = v.iconclass ? v.iconclass : v.type;
-                        v.icon = v.icon;
+                        if(v.icon)
+                            v.iconclass = undefined;
                         return nodes.push(v);
                     });
                     return nodes;
diff --git a/src/core/tags/GridViewTag.ts b/src/core/tags/GridViewTag.ts
index 90b4151..753de2c 100644
--- a/src/core/tags/GridViewTag.ts
+++ b/src/core/tags/GridViewTag.ts
@@ -346,6 +346,9 @@ namespace OS {
                  * @memberof SimpleGridCellTag
                  */
                 protected ondatachange(): void {
+                    const label = (this.refs.cell as LabelTag);
+                    label.icon = undefined;
+                    label.iconclass = undefined;
                     (this.refs.cell as LabelTag).set(this.data);
                 }
 
diff --git a/src/core/tags/MenuTag.ts b/src/core/tags/MenuTag.ts
index dfcc818..6eff0c0 100644
--- a/src/core/tags/MenuTag.ts
+++ b/src/core/tags/MenuTag.ts
@@ -386,14 +386,14 @@ namespace OS {
                  * @memberof SimpleMenuEntryTag
                  */
                 set icon(v: string) {
-                    $(this.refs.container).removeClass("fix_padding");
+                    //$(this.refs.container).removeClass("fix_padding");
                     if (!v) {
                         return;
                     }
                     //$(this).attr("icon", v);
                     const label = this.refs.label as LabelTag;
                     label.icon = v;
-                    $(this.refs.container).addClass("fix_padding");
+                    //$(this.refs.container).addClass("fix_padding");
                 }
 
                 /**
diff --git a/src/themes/antos_dark/afx-menu.css b/src/themes/antos_dark/afx-menu.css
index 346a998..093f534 100644
--- a/src/themes/antos_dark/afx-menu.css
+++ b/src/themes/antos_dark/afx-menu.css
@@ -1,8 +1,7 @@
 afx-menu afx-switch span{
-    width: 20px;
-    height: 16px;
+    padding-top: 3px;
     font-size: 16px;
-    /*margin-top:5px;*/
+    height: 19px;
 }
 afx-menu span.shortcut{
    text-align: right;
@@ -21,7 +20,6 @@ afx-menu afx-menu ul {
     background-color: #363636;
 }
 afx-menu ul  li /*, afx-menu ul >afx-menu-entry > li*/{
-    padding:3px;
     padding-left: 5px;
     padding-right: 5px;
 }
@@ -55,4 +53,8 @@ afx-menu afx-menu .afx_submenu:before, afx-menu  ul.context  .afx_submenu:before
  }
  afx-menu  ul.context li{
     min-width: 150px;
+ }
+
+afx-menu afx-label span {
+     height: 22px !important;
  }
\ No newline at end of file
diff --git a/src/themes/antos_light/afx-menu.css b/src/themes/antos_light/afx-menu.css
index 484c677..d9d3c33 100644
--- a/src/themes/antos_light/afx-menu.css
+++ b/src/themes/antos_light/afx-menu.css
@@ -1,8 +1,7 @@
 afx-menu afx-switch span{
-    width: 20px;
-    height: 16px;
+    padding-top: 3px;
     font-size: 16px;
-    /*margin-top:5px;*/
+    height: 19px;
 }
 afx-menu span.shortcut{
    text-align: right;
@@ -21,7 +20,6 @@ afx-menu afx-menu ul {
     background-color: #e7e7e7;
 }
 afx-menu ul  li /*, afx-menu ul >afx-menu-entry > li*/{
-    padding:3px;
     padding-left: 5px;
     padding-right: 5px;
 }
@@ -55,4 +53,8 @@ afx-menu afx-menu .afx_submenu:before, afx-menu  ul.context  .afx_submenu:before
  }
  afx-menu  ul.context li{
     min-width: 150px;
+ }
+
+afx-menu afx-label span {
+     height: 22px !important;
  }
\ No newline at end of file
diff --git a/src/themes/system/afx-label.css b/src/themes/system/afx-label.css
index 5ed7fc9..804d684 100644
--- a/src/themes/system/afx-label.css
+++ b/src/themes/system/afx-label.css
@@ -1,8 +1,15 @@
 afx-label  i.icon-style {
-    float: left;
+    display: inline-block;
+    flex-shrink: 0;
+}
+afx-label span {
+    display: flex;
+    flex-direction: row;
+    align-items:center;
 }
 afx-label  i.label-text{
     font-weight: normal;
     font-style: normal;
     margin-left: 3px;
+    flex: 1;
 }
\ No newline at end of file
diff --git a/src/themes/system/afx-menu.css b/src/themes/system/afx-menu.css
index 93e83a8..8b09736 100644
--- a/src/themes/system/afx-menu.css
+++ b/src/themes/system/afx-menu.css
@@ -34,6 +34,7 @@ afx-menu ul  li {
     float: left;
     cursor:default;
 }
+/*
 afx-menu ul  li.fix_padding{
     padding-top:1px;
     padding-bottom: 0;
@@ -45,7 +46,7 @@ afx-menu afx-menu ul  li.fix_padding{
     padding:3px;
     padding-left: 5px;
     padding-right: 5px;
-} 
+} */
 afx-menu  afx-menu {
     top:100%;
     left:0;
diff --git a/src/themes/system/afx-sys-panel.css b/src/themes/system/afx-sys-panel.css
index 2178dbd..9cb8370 100644
--- a/src/themes/system/afx-sys-panel.css
+++ b/src/themes/system/afx-sys-panel.css
@@ -96,4 +96,10 @@ afx-sys-panel afx-hbox[data-id="btlist"]  afx-button button
     height: 100%;
     border-radius: 0;
     border: 0px;
+}
+
+afx-sys-panel afx-list-view[data-id="applist"] afx-label span,
+afx-sys-panel afx-list-view[data-id="catlist"] afx-label span
+{
+    white-space: nowrap;
 }
\ No newline at end of file