Merge branch 'IconOverhaul' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-IconOverhaul

Source/Editor/Content/Items/CSharpScriptItem.cs

@@ -20,6 +20,6 @@ namespace FlaxEditor.Content
         }
         
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CSharpScript64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CSharpScript128;
     }
 }

Source/Editor/Content/Items/ContentFolder.cs

@@ -121,7 +121,7 @@ namespace FlaxEditor.Content
         public override bool Exists => Directory.Exists(Path);
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Folder64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Folder128;
 
         /// <inheritdoc />
         internal override void UpdatePath(string value)

Source/Editor/Content/Items/ContentItem.cs

@@ -455,7 +455,7 @@ namespace FlaxEditor.Content
                 const float thumbnailInShadowSize = 50.0f;
                 var shadowRect = rectangle.MakeExpanded((DefaultThumbnailSize - thumbnailInShadowSize) * rectangle.Width / DefaultThumbnailSize * 1.3f);
                 if (!_shadowIcon.IsValid)
-                    _shadowIcon = Editor.Instance.Icons.AssetShadow;
+                    _shadowIcon = Editor.Instance.Icons.AssetShadow128;
                 Render2D.DrawSprite(_shadowIcon, shadowRect);
             }
 

Source/Editor/Content/Items/CppScriptItem.cs

@@ -20,6 +20,6 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CppScript64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CPPScript128;
     }
 }

Source/Editor/Content/Items/FileItem.cs

@@ -26,6 +26,6 @@ namespace FlaxEditor.Content
         public override ContentItemSearchFilter SearchFilter => ContentItemSearchFilter.Other;
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document128;
     }
 }

Source/Editor/Content/Items/JsonAssetItem.cs

@@ -26,7 +26,7 @@ namespace FlaxEditor.Content
         public override ContentItemSearchFilter SearchFilter => ContentItemSearchFilter.Json;
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document128;
 
         /// <inheritdoc />
         protected override bool DrawShadow => false;

Source/Editor/Content/Items/NewItem.cs

@@ -40,7 +40,7 @@ namespace FlaxEditor.Content
         public override ContentItemSearchFilter SearchFilter => ContentItemSearchFilter.Other;
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document128;
 
         /// <inheritdoc />
         protected override bool DrawShadow => true;

Source/Editor/Content/Items/SceneItem.cs

@@ -28,7 +28,7 @@ namespace FlaxEditor.Content
         public override ContentItemSearchFilter SearchFilter => ContentItemSearchFilter.Scene;
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Scene64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Scene128;
 
         /// <inheritdoc />
         public override bool IsOfType(Type type)

Source/Editor/Content/Items/SettingsItem/AndroidPlatformSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.AndroidPlatformSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class AndroidPlatformSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AndroidPlatformSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public AndroidPlatformSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.AndroidSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/AudioSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.GameSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class AudioSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AudioSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public AudioSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.AudioSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/BuildSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.BuildSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class BuildSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BuildSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public BuildSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.BuildSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/GameSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.GameSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class GameSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GameSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public GameSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.GameSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/GraphicsSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.GraphicsSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class GraphicsSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphicsSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public GraphicsSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.GraphicsSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/InputSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.InputSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class InputSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InputSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public InputSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.InputSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/LayersAndTagsSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.LayersAndTagsSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class LayersAndTagsSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LayersAndTagsSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public LayersAndTagsSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.LayersTagsSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/LinuxPlatformSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.LinuxPlatformSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class LinuxPlatformSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinuxPlatformSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public LinuxPlatformSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.LinuxSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/NavigationSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.NavigationSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class NavigationSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NavigationSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public NavigationSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.NavigationSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/PhysicsSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.PhysicsSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class PhysicsSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PhysicsSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public PhysicsSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.PhysicsSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/TimeSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.TimeSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class TimeSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TimeSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public TimeSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.TimeSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/UWPPlatformSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.UWPPlatformSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class UWPPlatformSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UWPPlatformSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public UWPPlatformSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.UWPSettings128;
+    }
+}

Source/Editor/Content/Items/SettingsItem/WindowsPlatformSettingsItem.cs

@@ -0,0 +1,28 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+using System;
+using FlaxEngine;
+
+namespace FlaxEditor.Content
+{
+    /// <summary>
+    /// Content item that contains <see cref="FlaxEditor.Content.Settings.WindowsPlatformSettings"/> data.
+    /// </summary>
+    /// <seealso cref="FlaxEditor.Content.JsonAssetItem" />
+    public sealed class WindowsPlatformSettingsItem : JsonAssetItem
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WindowsPlatformSettingsItem"/> class.
+        /// </summary>
+        /// <param name="path">The asset path.</param>
+        /// <param name="id">The asset identifier.</param>
+        /// <param name="typeName">The Name of the resource type.</param>
+        public WindowsPlatformSettingsItem(string path, Guid id, string typeName)
+        : base(path, id, typeName)
+        {
+        }
+
+        /// <inheritdoc />
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.WindowsSettings128;
+    }
+}

Source/Editor/Content/Items/ShaderSourceItem.cs

@@ -27,6 +27,6 @@ namespace FlaxEditor.Content
         public override ContentItemSearchFilter SearchFilter => ContentItemSearchFilter.Shader;
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.Document128;
     }
 }

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -539,7 +539,7 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CodeScript64;
+        public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.VisualScript128;
 
         /// <inheritdoc />
         protected override bool DrawShadow => false;

Source/Editor/Content/Proxy/SettingsProxy.cs

@@ -44,6 +44,28 @@ namespace FlaxEditor.Content
             Editor.Instance.ContentImporting.Create(new SettingsCreateEntry(outputPath));
         }
 
+        /// <inheritdoc />
+        public override AssetItem ConstructItem(string path, string typeName, ref Guid id)
+        {
+            switch (typeName.Substring(typeName.LastIndexOf('.')+1))
+            {
+                case "GameSettings":            return new GameSettingsItem(path, id, typeName);
+                case "AndroidPlatformSettings": return new AndroidPlatformSettingsItem(path, id, typeName);
+                case "AudioSettings":           return new AudioSettingsItem(path, id, typeName);
+                case "BuildSettings":           return new BuildSettingsItem(path, id, typeName);
+                case "GraphicsSettings":        return new GraphicsSettingsItem(path, id, typeName);
+                case "InputSettings":           return new InputSettingsItem(path, id, typeName);
+                case "LayersAndTagsSettings":   return new LayersAndTagsSettingsItem(path, id, typeName);
+                case "LinuxPlatformSettings":   return new LinuxPlatformSettingsItem(path, id, typeName);
+                case "NavigationSettings":      return new NavigationSettingsItem(path, id, typeName);
+                case "PhysicsSettings":         return new PhysicsSettingsItem(path, id, typeName);
+                case "TimeSettings":            return new TimeSettingsItem(path, id, typeName);
+                case "UWPPlatformSettings":     return new UWPPlatformSettingsItem(path, id, typeName);
+                case "WindowsPlatformSettings": return new WindowsPlatformSettingsItem(path, id, typeName);
+            }
+            return base.ConstructItem(path, typeName, ref id);
+        }
+
         /// <inheritdoc />
         public override bool IsProxyFor<T>()
         {

Source/Editor/Content/Tree/ContentTreeNode.cs

@@ -77,7 +77,7 @@ namespace FlaxEditor.Content
         /// <param name="type">The folder type.</param>
         /// <param name="path">The folder path.</param>
         protected ContentTreeNode(ContentTreeNode parent, ContentFolderType type, string path)
-        : base(false, Editor.Instance.Icons.FolderClosed12, Editor.Instance.Icons.FolderOpened12)
+        : base(false, Editor.Instance.Icons.FolderClosed32, Editor.Instance.Icons.FolderOpen32)
         {
             _folder = new ContentFolder(type, path, this);
             Text = _folder.ShortName;

Source/Editor/Editor.cs

@@ -220,7 +220,7 @@ namespace FlaxEditor
             GameProject = ProjectInfo.Load(Internal_GetProjectPath());
 
             Icons = new EditorIcons();
-            Icons.GetIcons();
+            Icons.LoadIcons();
 
             // Create common editor modules
             RegisterModule(Options = new OptionsModule(this));

Source/Editor/EditorAssets.cs

@@ -45,7 +45,7 @@ namespace FlaxEditor
         /// <summary>
         /// The icons atlas.
         /// </summary>
-        public static string IconsAtlas = "Editor/IconsAtlas";
+        public static string IconsAtlas = "Editor/IconAtlasNew";
 
         /// <summary>
         /// The primary font.

Source/Editor/EditorIcons.cs

@@ -16,102 +16,124 @@ namespace FlaxEditor
     [HideInEditor]
     public sealed class EditorIcons
     {
-        public SpriteHandle FolderClosed12;
+        // 12px
-        public SpriteHandle FolderOpened12;
         public SpriteHandle DragBar12;
-        public SpriteHandle ArrowDown12;
-        public SpriteHandle ArrowRight12;
         public SpriteHandle Search12;
+        public SpriteHandle WindowDrag12;
+        public SpriteHandle CheckBoxIntermediate12;
+        public SpriteHandle ArrowRight12;
         public SpriteHandle Settings12;
         public SpriteHandle Cross12;
-        public SpriteHandle CheckBoxIntermediate12;
         public SpriteHandle CheckBoxTick12;
-        public SpriteHandle StatusBarSizeGrip12;
+        public SpriteHandle ArrowDown12;
 
-        public SpriteHandle ArrowRightBorder16;
+        // 32px
-        public SpriteHandle World16;
+        public SpriteHandle Scalar32;
-        public SpriteHandle ScaleStep16;
-        public SpriteHandle RotateStep16;
-        public SpriteHandle Grid16;
-        public SpriteHandle Translate16;
-        public SpriteHandle Rotate16;
-        public SpriteHandle Scale16;
-        public SpriteHandle Link16;
-        public SpriteHandle Docs16;
-
-        public SpriteHandle Save32;
-        public SpriteHandle Undo32;
-        public SpriteHandle Redo32;
         public SpriteHandle Translate32;
         public SpriteHandle Rotate32;
         public SpriteHandle Scale32;
-        public SpriteHandle Play32;
+        public SpriteHandle Grid32;
-        public SpriteHandle Pause32;
+        public SpriteHandle Flax32;
-        public SpriteHandle Step32;
+        public SpriteHandle RotateSnap32;
-        public SpriteHandle Stop32;
+        public SpriteHandle ScaleSnap32;
-        public SpriteHandle PageScale32;
+        public SpriteHandle Globe32;
-        public SpriteHandle Bone32;
+        public SpriteHandle CamSpeed32;
-        public SpriteHandle Docs32;
-        public SpriteHandle Import32;
-        public SpriteHandle AddDoc32;
-        public SpriteHandle RemoveDoc32;
-        public SpriteHandle BracketsSlash32;
-        public SpriteHandle Find32;
-        public SpriteHandle Reload32;
-        public SpriteHandle ArrowLeft32;
-        public SpriteHandle ArrowRight32;
-        public SpriteHandle ArrowDown32;
-        public SpriteHandle ArrowUp32;
-        public SpriteHandle Error32;
-        public SpriteHandle Warning32;
-        public SpriteHandle Info32;
-        public SpriteHandle UV32;
-        public SpriteHandle Image32;
         public SpriteHandle Link32;
-        public SpriteHandle Next32;
+        public SpriteHandle Add32;
-        public SpriteHandle Camera32;
+        public SpriteHandle Left32;
-        public SpriteHandle Build32;
+        public SpriteHandle Right32;
+        public SpriteHandle Up32;
+        public SpriteHandle Down32;
+        public SpriteHandle FolderClosed32;
+        public SpriteHandle FolderOpen32;
 
-        public SpriteHandle Add48;
+        // Visject
-        public SpriteHandle Paint48;
+        public SpriteHandle VisjectBoxOpen32;
-        public SpriteHandle Foliage48;
+        public SpriteHandle VisjectBoxClosed32;
-        public SpriteHandle Mountain48;
+        public SpriteHandle VisjectArrowOpen32;
+        public SpriteHandle VisjectArrowClosed32;
 
-        public SpriteHandle Plugin64;
+        // 64px
-        public SpriteHandle Document64;
+        public SpriteHandle Flax64;
-        public SpriteHandle CSharpScript64;
+        public SpriteHandle Save64;
-        public SpriteHandle CppScript64;
+        public SpriteHandle Play64;
+        public SpriteHandle Stop64;
+        public SpriteHandle Pause64;
+        public SpriteHandle Skip64;
+        public SpriteHandle Info64;
+        public SpriteHandle Error64;
+        public SpriteHandle Warning64;
+        public SpriteHandle AddFile64;
+        public SpriteHandle DeleteFile64;
+        public SpriteHandle Import64;
+        public SpriteHandle Left64;
+        public SpriteHandle Right64;
+        public SpriteHandle Up64;
+        public SpriteHandle Down64;
+        public SpriteHandle Undo64;
+        public SpriteHandle Redo64;
+        public SpriteHandle Translate64;
+        public SpriteHandle Rotate64;
+        public SpriteHandle Scale64;
+        public SpriteHandle Refresh64;
+        public SpriteHandle Shift64;
+        public SpriteHandle Code64;
         public SpriteHandle Folder64;
-        public SpriteHandle Scene64;
+        public SpriteHandle CenterView64;
-        public SpriteHandle CodeScript64;
+        public SpriteHandle Image64;
+        public SpriteHandle Camera64;
+        public SpriteHandle Docs64;
+        public SpriteHandle Search64;
+        public SpriteHandle Bone64;
+        public SpriteHandle Link64;
+        public SpriteHandle Build64;
+        public SpriteHandle Add64;
 
-        public SpriteHandle Logo128;
+        // 96px
+        public SpriteHandle Toolbox96;
+        public SpriteHandle Paint96;
+        public SpriteHandle Foliage96;
+        public SpriteHandle Terrain96;
 
-        public SpriteHandle VisjectBoxOpen;
+        // 128px
-        public SpriteHandle VisjectBoxClose;
+        public SpriteHandle AndroidSettings128;
-        public SpriteHandle VisjectArrowOpen;
+        public SpriteHandle PlaystationSettings128;
-        public SpriteHandle VisjectArrowClose;
+        public SpriteHandle InputSettings128;
+        public SpriteHandle PhysicsSettings128;
+        public SpriteHandle CSharpScript128;
+        public SpriteHandle Folder128;
+        public SpriteHandle WindowsIcon128;
+        public SpriteHandle LinuxIcon128;
+        public SpriteHandle UWPSettings128;
+        public SpriteHandle XBOXSettings128;
+        public SpriteHandle LayersTagsSettings128;
+        public SpriteHandle GraphicsSettings128;
+        public SpriteHandle CPPScript128;
+        public SpriteHandle Plugin128;
+        public SpriteHandle XBoxScarletIcon128;
+        public SpriteHandle AssetShadow128;
+        public SpriteHandle WindowsSettings128;
+        public SpriteHandle TimeSettings128;
+        public SpriteHandle GameSettings128;
+        public SpriteHandle VisualScript128;
+        public SpriteHandle Document128;
+        public SpriteHandle XBoxOne128;
+        public SpriteHandle UWPStore128;
+        public SpriteHandle ColorWheel128;
+        public SpriteHandle LinuxSettings128;
+        public SpriteHandle NavigationSettings128;
+        public SpriteHandle AudioSettings128;
+        public SpriteHandle BuildSettings128;
+        public SpriteHandle Scene128;
+        public SpriteHandle AndroidIcon128;
+        public SpriteHandle PS4Icon128;
+        public SpriteHandle FlaxLogo128;
 
-        public SpriteHandle AssetShadow;
+        internal void LoadIcons()
-        public SpriteHandle ColorWheel;
-        public SpriteHandle Windows;
-        public SpriteHandle XboxOne;
-        public SpriteHandle WindowsStore;
-        public SpriteHandle Linux;
-        public SpriteHandle PS4;
-        public SpriteHandle XboxSeriesX;
-        public SpriteHandle Android;
-
-        internal void GetIcons()
         {
-            // Load asset
+            // Load & validate
             var iconsAtlas = FlaxEngine.Content.LoadAsyncInternal<SpriteAtlas>(EditorAssets.IconsAtlas);
-            if (iconsAtlas == null)
+            if (iconsAtlas is null || iconsAtlas.WaitForLoaded())
-            {
-                Editor.LogError("Cannot load editor icons atlas.");
-                return;
-            }
-            if (iconsAtlas.WaitForLoaded())
             {
                 Editor.LogError("Failed to load editor icons atlas.");
                 return;
@@ -122,11 +144,11 @@ namespace FlaxEditor
             for (int i = 0; i < fields.Length; i++)
             {
                 var field = fields[i];
+
                 var sprite = iconsAtlas.FindSprite(field.Name);
                 if (!sprite.IsValid)
-                {
+                    Editor.LogWarning($"Failed to load sprite icon \'{field.Name}\'.");
-                    Editor.LogWarning(string.Format("Failed to load sprite icon \'{0}\'.", field.Name));
+
-                }
                 field.SetValue(this, sprite);
             }
         }

Source/Editor/GUI/Dialogs/ColorSelector.cs

@@ -61,7 +61,7 @@ namespace FlaxEditor.GUI.Dialogs
         public ColorSelector(float wheelSize = 64)
         : base(0, 0, wheelSize, wheelSize)
         {
-            _colorWheelSprite = Editor.Instance.Icons.ColorWheel;
+            _colorWheelSprite = Editor.Instance.Icons.ColorWheel128;
             _wheelRect = new Rectangle(0, 0, wheelSize, wheelSize);
         }
 

Source/Editor/GUI/Input/ValueBox.cs

@@ -184,7 +184,7 @@ namespace FlaxEditor.GUI.Input
                 var style = Style.Current;
 
                 // Draw sliding UI
-                Render2D.DrawSprite(style.Scale, SlideRect, style.Foreground);
+                Render2D.DrawSprite(style.Scalar, SlideRect, style.Foreground);
 
                 // Check if is sliding
                 if (_isSliding)

Source/Editor/GUI/PlatformSelector.cs

@@ -82,14 +82,15 @@ namespace FlaxEditor.GUI
             var icons = Editor.Instance.Icons;
             var platforms = new[]
             {
-                new PlatformData(PlatformType.Windows, icons.Windows, "Windows"),
+                new PlatformData(PlatformType.Windows, icons.WindowsIcon128, "Windows"),
-                new PlatformData(PlatformType.XboxOne, icons.XboxOne, "Xbox One"),
+                new PlatformData(PlatformType.XboxOne, icons.XBoxOne128, "Xbox One"),
-                new PlatformData(PlatformType.UWP, icons.WindowsStore, "Windows Store"),
+                new PlatformData(PlatformType.UWP, icons.UWPStore128, "Windows Store"),
-                new PlatformData(PlatformType.Linux, icons.Linux, "Linux"),
+                new PlatformData(PlatformType.Linux, icons.LinuxIcon128, "Linux"),
-                new PlatformData(PlatformType.PS4, icons.PS4, "PlayStation 4"),
+                new PlatformData(PlatformType.PS4, icons.PS4Icon128, "PlayStation 4"),
-                new PlatformData(PlatformType.XboxScarlett, icons.XboxSeriesX, "Xbox Scarlett"),
+                new PlatformData(PlatformType.XboxScarlett, icons.XBoxScarletIcon128, "Xbox Scarlett"),
-                new PlatformData(PlatformType.Android, icons.Android, "Android"),
+                new PlatformData(PlatformType.Android, icons.AndroidIcon128, "Android"),
-                new PlatformData(PlatformType.Switch, icons.ColorWheel, "Switch"),
+                new PlatformData(PlatformType.Switch, icons.ColorWheel128, "Switch"),
+
             };
 
             const float IconSize = 48.0f;

Source/Editor/GUI/Timeline/GUI/GradientEditor.cs

@@ -63,7 +63,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
                 var isMouseOver = IsMouseOver;
                 var color = Gradient._data[Index].Value;
                 var icons = Editor.Instance.Icons;
-                var icon = icons.VisjectBoxClose;
+                var icon = icons.VisjectBoxClosed32;
 
                 Render2D.DrawSprite(icon, new Rectangle(0.0f, 0.0f, 10.0f, 10.0f), isMouseOver ? Color.Gray : Color.Black);
                 Render2D.DrawSprite(icon, new Rectangle(1.0f, 1.0f, 8.0f, 8.0f), color);

Source/Editor/GUI/Timeline/GUI/PositionHandle.cs

@@ -26,7 +26,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
         public override void Draw()
         {
             var style = Style.Current;
-            var icon = Editor.Instance.Icons.VisjectArrowClose;
+            var icon = Editor.Instance.Icons.VisjectArrowClosed32;
             var timeAxisHeaderOffset = -_timeline.MediaBackground.ViewOffset.Y;
 
             Matrix3x3.RotationZ(Mathf.PiOverTwo, out var m1);

Source/Editor/GUI/Timeline/Timeline.cs

@@ -738,7 +738,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[0] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Rewind to timeline start (Home)",
-                        Brush = new SpriteBrush(icons.Step32),
+                        Brush = new SpriteBrush(icons.Skip64),
                         Enabled = false,
                         Visible = false,
                         Rotation = 180.0f,
@@ -750,7 +750,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[1] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Seek back to the previous keyframe (Page Down)",
-                        Brush = new SpriteBrush(icons.Next32),
+                        Brush = new SpriteBrush(icons.Shift64),
                         Enabled = false,
                         Visible = false,
                         Rotation = 180.0f,
@@ -766,7 +766,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[2] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Move one frame back (Left Arrow)",
-                        Brush = new SpriteBrush(icons.ArrowLeft32),
+                        Brush = new SpriteBrush(icons.Left32),
                         Enabled = false,
                         Visible = false,
                         Parent = playbackButtonsPanel
@@ -779,7 +779,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackStop = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Stop playback",
-                        Brush = new SpriteBrush(icons.Stop32),
+                        Brush = new SpriteBrush(icons.Stop64),
                         Visible = false,
                         Enabled = false,
                         Parent = playbackButtonsPanel
@@ -792,7 +792,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackPlay = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Play/pause playback (Space)",
-                        Brush = new SpriteBrush(icons.Play32),
+                        Brush = new SpriteBrush(icons.Play64),
                         Visible = false,
                         Tag = false, // Set to true if image is set to Pause, false if Play
                         Parent = playbackButtonsPanel
@@ -805,7 +805,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[3] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Move one frame forward (Right Arrow)",
-                        Brush = new SpriteBrush(icons.ArrowRight32),
+                        Brush = new SpriteBrush(icons.Right32),
                         Enabled = false,
                         Visible = false,
                         Parent = playbackButtonsPanel
@@ -816,7 +816,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[4] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Seek to the next keyframe (Page Up)",
-                        Brush = new SpriteBrush(icons.Next32),
+                        Brush = new SpriteBrush(icons.Shift64),
                         Enabled = false,
                         Visible = false,
                         Parent = playbackButtonsPanel
@@ -831,7 +831,7 @@ namespace FlaxEditor.GUI.Timeline
                     _playbackNavigation[5] = new Image(playbackButtonsPanel.Width, 0, playbackButtonsSize, playbackButtonsSize)
                     {
                         TooltipText = "Rewind to timeline end (End)",
-                        Brush = new SpriteBrush(icons.Step32),
+                        Brush = new SpriteBrush(icons.Skip64),
                         Enabled = false,
                         Visible = false,
                         Parent = playbackButtonsPanel
@@ -1189,7 +1189,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     _playbackPlay.Visible = true;
                     _playbackPlay.Enabled = _canPlayPauseStop;
-                    _playbackPlay.Brush = new SpriteBrush(icons.Play32);
+                    _playbackPlay.Brush = new SpriteBrush(icons.Play64);
                     _playbackPlay.Tag = false;
                 }
                 if (_positionHandle != null)
@@ -1215,7 +1215,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     _playbackPlay.Visible = true;
                     _playbackPlay.Enabled = _canPlayPauseStop;
-                    _playbackPlay.Brush = new SpriteBrush(icons.Pause32);
+                    _playbackPlay.Brush = new SpriteBrush(icons.Pause64);
                     _playbackPlay.Tag = true;
                 }
                 if (_positionHandle != null)
@@ -1241,7 +1241,7 @@ namespace FlaxEditor.GUI.Timeline
                 {
                     _playbackPlay.Visible = true;
                     _playbackPlay.Enabled = _canPlayPauseStop;
-                    _playbackPlay.Brush = new SpriteBrush(icons.Play32);
+                    _playbackPlay.Brush = new SpriteBrush(icons.Play64);
                     _playbackPlay.Tag = false;
                 }
                 if (_positionHandle != null)

Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs

@@ -322,7 +322,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 IsScrollable = false,
                 Color = Style.Current.ForegroundGrey,
                 Margin = new Margin(1),
-                Brush = new SpriteBrush(icons.ArrowRight32),
+                Brush = new SpriteBrush(icons.Right32),
                 Offsets = new Margin(-buttonSize - 2 + _muteCheckbox.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                 Parent = this,
             };
@@ -335,7 +335,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 IsScrollable = false,
                 Color = Style.Current.ForegroundGrey,
                 Margin = new Margin(3),
-                Brush = new SpriteBrush(icons.Add48),
+                Brush = new SpriteBrush(icons.Add32),
                 Offsets = new Margin(-buttonSize - 2 + rightKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                 Parent = this,
             };
@@ -348,7 +348,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 IsScrollable = false,
                 Color = Style.Current.ForegroundGrey,
                 Margin = new Margin(1),
-                Brush = new SpriteBrush(icons.ArrowLeft32),
+                Brush = new SpriteBrush(icons.Left32),
                 Offsets = new Margin(-buttonSize - 2 + addKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                 Parent = this,
             };

Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs

@@ -695,7 +695,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 IsScrollable = false,
                 Color = Style.Current.ForegroundGrey,
                 Margin = new Margin(1),
-                Brush = new SpriteBrush(icons.Camera32),
+                Brush = new SpriteBrush(icons.Camera64),
                 Offsets = new Margin(-buttonSize - 2 + _selectActor.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                 Parent = this,
             };

Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs

@@ -128,7 +128,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                     IsScrollable = false,
                     Color = Style.Current.ForegroundGrey,
                     Margin = new Margin(1),
-                    Brush = new SpriteBrush(icons.ArrowRight32),
+                    Brush = new SpriteBrush(icons.Right64),
                     Offsets = new Margin(-buttonSize - 2 + uiLeft, buttonSize, buttonSize * -0.5f, buttonSize),
                     Parent = this,
                 };
@@ -138,9 +138,9 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                     AutoFocus = true,
                     AnchorPreset = AnchorPresets.MiddleRight,
                     IsScrollable = false,
-                    Color = Style.Current.ForegroundGrey,
+                    Color = Style.Current.Foreground,
                     Margin = new Margin(3),
-                    Brush = new SpriteBrush(icons.Add48),
+                    Brush = new SpriteBrush(icons.Add64),
                     Offsets = new Margin(-buttonSize - 2 + _rightKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                     Parent = this,
                 };
@@ -150,9 +150,9 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                     AutoFocus = true,
                     AnchorPreset = AnchorPresets.MiddleRight,
                     IsScrollable = false,
-                    Color = Style.Current.ForegroundGrey,
+                    Color = Style.Current.Foreground,
                     Margin = new Margin(1),
-                    Brush = new SpriteBrush(icons.ArrowLeft32),
+                    Brush = new SpriteBrush(icons.Left64),
                     Offsets = new Margin(-buttonSize - 2 + _addKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize),
                     Parent = this,
                 };

Source/Editor/Modules/UIModule.cs

@@ -190,7 +190,7 @@ namespace FlaxEditor.Modules
             if (isDuringBreakpointHang)
             {
                 play.Checked = false;
-                play.Icon = Editor.Icons.Stop32;
+                play.Icon = Editor.Icons.Stop64;
                 pause.Enabled = false;
                 pause.Checked = true;
                 pause.AutoCheck = false;
@@ -199,7 +199,7 @@ namespace FlaxEditor.Modules
             else if (isPlayMode)
             {
                 play.Checked = false;
-                play.Icon = Editor.Icons.Stop32;
+                play.Icon = Editor.Icons.Stop64;
                 pause.Enabled = true;
                 pause.Checked = Editor.StateMachine.PlayingState.IsPaused;
                 pause.AutoCheck = false;
@@ -208,7 +208,7 @@ namespace FlaxEditor.Modules
             else
             {
                 play.Checked = Editor.Simulation.IsPlayModeRequested;
-                play.Icon = Editor.Icons.Play32;
+                play.Icon = Editor.Icons.Play64;
                 pause.Enabled = canEnterPlayMode;
                 pause.AutoCheck = true;
                 step.Enabled = false;
@@ -501,20 +501,20 @@ namespace FlaxEditor.Modules
                 Parent = mainWindow,
             };
 
-            _toolStripSaveAll = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Save32, Editor.SaveAll).LinkTooltip("Save all (Ctrl+S)");
+            _toolStripSaveAll = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Save64, Editor.SaveAll).LinkTooltip("Save all (Ctrl+S)");
             ToolStrip.AddSeparator();
-            _toolStripUndo = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Undo32, Editor.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _toolStripUndo = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Undo64, Editor.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _toolStripRedo = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Redo32, Editor.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _toolStripRedo = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Redo64, Editor.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             ToolStrip.AddSeparator();
             _toolStripTranslate = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Translate32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Translate).LinkTooltip("Change Gizmo tool mode to Translate (1)");
             _toolStripRotate = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Rotate32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)");
             _toolStripScale = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Scale32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)");
             ToolStrip.AddSeparator();
-            _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build32, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)");
+            _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build64, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)");
             ToolStrip.AddSeparator();
-            _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play32, Editor.Simulation.RequestPlayOrStopPlay).LinkTooltip("Start/Stop game (F5)");
+            _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, Editor.Simulation.RequestPlayOrStopPlay).LinkTooltip("Start/Stop game (F5)");
-            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause32, Editor.Simulation.RequestResumeOrPause).LinkTooltip("Pause/Resume game(F6)");
+            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip("Pause/Resume game(F6)");
-            _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Step32, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game");
+            _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Skip64, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game");
 
             UpdateToolstrip();
         }

Source/Editor/Options/OptionsModule.cs

@@ -248,10 +248,11 @@ namespace FlaxEditor.Options
                 Cross = Editor.Icons.Cross12,
                 CheckBoxIntermediate = Editor.Icons.CheckBoxIntermediate12,
                 CheckBoxTick = Editor.Icons.CheckBoxTick12,
-                StatusBarSizeGrip = Editor.Icons.StatusBarSizeGrip12,
+                StatusBarSizeGrip = Editor.Icons.WindowDrag12,
-                Translate = Editor.Icons.Translate16,
+                Translate = Editor.Icons.Translate32,
-                Rotate = Editor.Icons.Rotate16,
+                Rotate = Editor.Icons.Rotate32,
-                Scale = Editor.Icons.Scale16,
+                Scale = Editor.Icons.Scale32,
+                Scalar = Editor.Icons.Scalar32,
 
                 SharedTooltip = new Tooltip()
             };

Source/Editor/Surface/Archetypes/Function.cs

@@ -1993,7 +1993,7 @@ namespace FlaxEditor.Surface.Archetypes
                 }
                 else if (_isBind)
                 {
-                    _helperButton.Brush = new SpriteBrush(Editor.Instance.Icons.Add48);
+                    _helperButton.Brush = new SpriteBrush(Editor.Instance.Icons.Add64);
                     _helperButton.Color = Color.Red;
                     _helperButton.TooltipText = "Add new handler function and bind it to this event";
                     _helperButton.Enabled = _signature != null;

Source/Editor/Surface/Archetypes/Tools.cs

@@ -104,7 +104,7 @@ namespace FlaxEditor.Surface.Archetypes
                         color *= 1.3f;
                     color.A = 1.0f;
                     var icons = Editor.Instance.Icons;
-                    var icon = isSelected ? icons.VisjectArrowClose : icons.VisjectArrowOpen;
+                    var icon = isSelected ? icons.VisjectArrowClosed32 : icons.VisjectArrowOpen32;
 
                     Render2D.PushTransform(ref arrowTransform);
                     Render2D.DrawSprite(icon, arrowRect, color);

Source/Editor/Surface/SurfaceStyle.cs

@@ -224,10 +224,10 @@ namespace FlaxEditor.Surface
                 },
                 Icons =
                 {
-                    BoxOpen = editor.Icons.VisjectBoxOpen,
+                    BoxOpen = editor.Icons.VisjectBoxOpen32,
-                    BoxClose = editor.Icons.VisjectBoxClose,
+                    BoxClose = editor.Icons.VisjectBoxClosed32,
-                    ArrowOpen = editor.Icons.VisjectArrowOpen,
+                    ArrowOpen = editor.Icons.VisjectArrowOpen32,
-                    ArrowClose = editor.Icons.VisjectArrowClose,
+                    ArrowClose = editor.Icons.VisjectArrowClosed32,
                 },
                 Background = editor.UI.VisjectSurfaceBackground,
             };

Source/Editor/Surface/VisjectSurfaceWindow.cs

@@ -759,12 +759,12 @@ namespace FlaxEditor.Surface
             _propertiesEditor.Modified += OnPropertyEdited;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.PageScale32, ShowWholeGraph).LinkTooltip("Show whole graph");
+            _toolstrip.AddButton(editor.Icons.CenterView64, ShowWholeGraph).LinkTooltip("Show whole graph");
 
             // Setup input actions
             InputActions.Add(options => options.Undo, _undo.PerformUndo);

Source/Editor/Viewport/EditorViewport.cs

@@ -443,7 +443,7 @@ namespace FlaxEditor.Viewport
                 // Camera speed widget
                 var camSpeed = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
                 var camSpeedCM = new ContextMenu();
-                var camSpeedButton = new ViewportWidgetButton(_movementSpeed.ToString(), Editor.Instance.Icons.ArrowRightBorder16, camSpeedCM)
+                var camSpeedButton = new ViewportWidgetButton(_movementSpeed.ToString(), Editor.Instance.Icons.CamSpeed32, camSpeedCM)
                 {
                     Tag = this,
                     TooltipText = "Camera speed scale"
@@ -484,7 +484,7 @@ namespace FlaxEditor.Viewport
                 // View Flags
                 {
                     var viewFlags = ViewWidgetButtonMenu.AddChildMenu("View Flags").ContextMenu;
-                    viewFlags.AddButton("Reset flags", () => Task.ViewFlags = ViewFlags.DefaultEditor).Icon = Editor.Instance.Icons.Rotate16;
+                    viewFlags.AddButton("Reset flags", () => Task.ViewFlags = ViewFlags.DefaultEditor).Icon = Editor.Instance.Icons.Rotate32;
                     viewFlags.AddSeparator();
                     for (int i = 0; i < EditorViewportViewFlagsValues.Length; i++)
                     {

Source/Editor/Viewport/MainEditorGizmoViewport.cs

@@ -219,7 +219,7 @@ namespace FlaxEditor.Viewport
 
             // Transform space widget
             var transformSpaceWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var transformSpaceToggle = new ViewportWidgetButton(string.Empty, editor.Icons.World16, null, true)
+            var transformSpaceToggle = new ViewportWidgetButton(string.Empty, editor.Icons.Globe32, null, true)
             {
                 Checked = TransformGizmo.ActiveTransformSpace == TransformGizmoBase.TransformSpace.World,
                 TooltipText = "Gizmo transform space (world or local)",
@@ -230,7 +230,7 @@ namespace FlaxEditor.Viewport
 
             // Scale snapping widget
             var scaleSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableScaleSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.ScaleStep16, null, true)
+            var enableScaleSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.ScaleSnap32, null, true)
             {
                 Checked = TransformGizmo.ScaleSnapEnabled,
                 TooltipText = "Enable scale snapping",
@@ -257,7 +257,7 @@ namespace FlaxEditor.Viewport
 
             // Rotation snapping widget
             var rotateSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableRotateSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.RotateStep16, null, true)
+            var enableRotateSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.RotateSnap32, null, true)
             {
                 Checked = TransformGizmo.RotationSnapEnabled,
                 TooltipText = "Enable rotation snapping",
@@ -284,7 +284,7 @@ namespace FlaxEditor.Viewport
 
             // Translation snapping widget
             var translateSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableTranslateSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.Grid16, null, true)
+            var enableTranslateSnapping = new ViewportWidgetButton(string.Empty, editor.Icons.Grid32, null, true)
             {
                 Checked = TransformGizmo.TranslationSnapEnable,
                 TooltipText = "Enable position snapping",
@@ -311,7 +311,7 @@ namespace FlaxEditor.Viewport
 
             // Gizmo mode widget
             var gizmoMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            _gizmoModeTranslate = new ViewportWidgetButton(string.Empty, editor.Icons.Translate16, null, true)
+            _gizmoModeTranslate = new ViewportWidgetButton(string.Empty, editor.Icons.Translate32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Translate,
                 TooltipText = "Translate gizmo mode",
@@ -319,14 +319,14 @@ namespace FlaxEditor.Viewport
                 Parent = gizmoMode
             };
             _gizmoModeTranslate.Toggled += OnGizmoModeToggle;
-            _gizmoModeRotate = new ViewportWidgetButton(string.Empty, editor.Icons.Rotate16, null, true)
+            _gizmoModeRotate = new ViewportWidgetButton(string.Empty, editor.Icons.Rotate32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Rotate,
                 TooltipText = "Rotate gizmo mode",
                 Parent = gizmoMode
             };
             _gizmoModeRotate.Toggled += OnGizmoModeToggle;
-            _gizmoModeScale = new ViewportWidgetButton(string.Empty, editor.Icons.Scale16, null, true)
+            _gizmoModeScale = new ViewportWidgetButton(string.Empty, editor.Icons.Scale32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Scale,
                 TooltipText = "Scale gizmo mode",

Source/Editor/Viewport/PrefabWindowViewport.cs

@@ -118,7 +118,7 @@ namespace FlaxEditor.Viewport
 
             // Transform space widget
             var transformSpaceWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var transformSpaceToggle = new ViewportWidgetButton(string.Empty, window.Editor.Icons.World16, null, true)
+            var transformSpaceToggle = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Globe32, null, true)
             {
                 Checked = TransformGizmo.ActiveTransformSpace == TransformGizmoBase.TransformSpace.World,
                 TooltipText = "Gizmo transform space (world or local)",
@@ -129,7 +129,7 @@ namespace FlaxEditor.Viewport
 
             // Scale snapping widget
             var scaleSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableScaleSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.ScaleStep16, null, true)
+            var enableScaleSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.ScaleSnap32, null, true)
             {
                 Checked = TransformGizmo.ScaleSnapEnabled,
                 TooltipText = "Enable scale snapping",
@@ -156,7 +156,7 @@ namespace FlaxEditor.Viewport
 
             // Rotation snapping widget
             var rotateSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableRotateSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.RotateStep16, null, true)
+            var enableRotateSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.RotateSnap32, null, true)
             {
                 Checked = TransformGizmo.RotationSnapEnabled,
                 TooltipText = "Enable rotation snapping",
@@ -183,7 +183,7 @@ namespace FlaxEditor.Viewport
 
             // Translation snapping widget
             var translateSnappingWidget = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            var enableTranslateSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Grid16, null, true)
+            var enableTranslateSnapping = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Grid32, null, true)
             {
                 Checked = TransformGizmo.TranslationSnapEnable,
                 TooltipText = "Enable position snapping",
@@ -210,7 +210,7 @@ namespace FlaxEditor.Viewport
 
             // Gizmo mode widget
             var gizmoMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
-            _gizmoModeTranslate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Translate16, null, true)
+            _gizmoModeTranslate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Translate32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Translate,
                 TooltipText = "Translate gizmo mode",
@@ -218,14 +218,14 @@ namespace FlaxEditor.Viewport
                 Parent = gizmoMode
             };
             _gizmoModeTranslate.Toggled += OnGizmoModeToggle;
-            _gizmoModeRotate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Rotate16, null, true)
+            _gizmoModeRotate = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Rotate32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Rotate,
                 TooltipText = "Rotate gizmo mode",
                 Parent = gizmoMode
             };
             _gizmoModeRotate.Toggled += OnGizmoModeToggle;
-            _gizmoModeScale = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Scale16, null, true)
+            _gizmoModeScale = new ViewportWidgetButton(string.Empty, window.Editor.Icons.Scale32, null, true)
             {
                 Tag = TransformGizmoBase.Mode.Scale,
                 TooltipText = "Scale gizmo mode",

Source/Editor/Windows/AboutDialog.cs

@@ -34,7 +34,7 @@ namespace FlaxEditor.Windows
         {
             Image icon = new Image(4, 4, 80, 80)
             {
-                Brush = new SpriteBrush(Editor.Instance.Icons.Logo128),
+                Brush = new SpriteBrush(Editor.Instance.Icons.FlaxLogo128),
                 Parent = this
             };
             var nameLabel = new Label(icon.Right + 10, icon.Top, 200, 34)

Source/Editor/Windows/Assets/AnimationGraphFunctionWindow.cs

@@ -33,7 +33,7 @@ namespace FlaxEditor.Windows.Assets
 
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/anim-graph/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/anim-graph/index.html")).LinkTooltip("See documentation to learn more");
 
             // Navigation bar
             _navigationBar = new NavigationBar

Source/Editor/Windows/Assets/AnimationGraphWindow.cs

@@ -251,9 +251,9 @@ namespace FlaxEditor.Windows.Assets
             _surface.ContextChanged += OnSurfaceContextChanged;
 
             // Toolstrip
-            _toolstrip.AddButton(editor.Icons.Bone32, () => _preview.ShowNodes = !_preview.ShowNodes).SetAutoCheck(true).LinkTooltip("Show animated model nodes debug view");
+            _toolstrip.AddButton(editor.Icons.Bone64, () => _preview.ShowNodes = !_preview.ShowNodes).SetAutoCheck(true).LinkTooltip("Show animated model nodes debug view");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/anim-graph/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/anim-graph/index.html")).LinkTooltip("See documentation to learn more");
 
             // Debug picker
             var debugPickerContainer = new ContainerControl();

Source/Editor/Windows/Assets/AnimationWindow.cs

@@ -150,12 +150,12 @@ namespace FlaxEditor.Windows.Assets
             _propertiesPresenter.Modified += MarkAsEdited;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/animation/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/animation/index.html")).LinkTooltip("See documentation to learn more");
 
             // Setup input actions
             InputActions.Add(options => options.Undo, _undo.PerformUndo);

Source/Editor/Windows/Assets/AssetEditorWindow.cs

@@ -53,7 +53,7 @@ namespace FlaxEditor.Windows.Assets
             {
                 Parent = this
             };
-            _toolstrip.AddButton(editor.Icons.Find32, () => Editor.Windows.ContentWin.Select(_item)).LinkTooltip("Show and select in Content Window");
+            _toolstrip.AddButton(editor.Icons.Search64, () => Editor.Windows.ContentWin.Select(_item)).LinkTooltip("Show and select in Content Window");
 
             InputActions.Add(options => options.Save, Save);
 

Source/Editor/Windows/Assets/AudioClipWindow.cs

@@ -152,12 +152,12 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Select(_properties);
 
             // Toolstrip
-            _toolstrip.AddButton(Editor.Icons.Import32, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
+            _toolstrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
             _toolstrip.AddSeparator();
-            _playButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Play32, OnPlay).LinkTooltip("Play/stop audio");
+            _playButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Play64, OnPlay).LinkTooltip("Play/stop audio");
-            _pauseButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Pause32, OnPause).LinkTooltip("Pause audio");
+            _pauseButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Pause64, OnPause).LinkTooltip("Pause audio");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/audio/audio-clip.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/audio/audio-clip.html")).LinkTooltip("See documentation to learn more");
         }
 
         private void OnPlay()
@@ -244,7 +244,7 @@ namespace FlaxEditor.Windows.Assets
         {
             base.UpdateToolstrip();
 
-            _playButton.Icon = _previewSource && _previewSource.State == AudioSource.States.Playing ? Editor.Icons.Stop32 : Editor.Icons.Play32;
+            _playButton.Icon = _previewSource && _previewSource.State == AudioSource.States.Playing ? Editor.Icons.Stop64 : Editor.Icons.Play64;
             _pauseButton.Enabled = _previewSource && _previewSource.State == AudioSource.States.Playing;
         }
 

Source/Editor/Windows/Assets/CollisionDataWindow.cs

@@ -182,7 +182,7 @@ namespace FlaxEditor.Windows.Assets
         {
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/physics/colliders/collision-data.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/physics/colliders/collision-data.html")).LinkTooltip("See documentation to learn more");
 
             // Split Panel
             _split = new SplitPanel(Orientation.Horizontal, ScrollBars.None, ScrollBars.Vertical)

Source/Editor/Windows/Assets/CubeTextureWindow.cs

@@ -140,9 +140,9 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Select(_properties);
 
             // Toolstrip
-            _toolstrip.AddButton(Editor.Icons.Import32, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
+            _toolstrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/textures/cube-textures.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/textures/cube-textures.html")).LinkTooltip("See documentation to learn more");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/FontWindow.cs

@@ -111,7 +111,7 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Select(_proxy);
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
         }
 
         private void OnTextChanged()

Source/Editor/Windows/Assets/GameplayGlobalsWindow.cs

@@ -407,10 +407,10 @@ namespace FlaxEditor.Windows.Assets
             _proxy = new PropertiesProxy();
             _propertiesEditor.Select(_proxy);
 
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save asset");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save asset");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
             _resetButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Rotate32, Reset).LinkTooltip("Resets the variables values to the default values");
 

Source/Editor/Windows/Assets/IESProfileWindow.cs

@@ -27,9 +27,9 @@ namespace FlaxEditor.Windows.Assets
             };
 
             // Toolstrip
-            _toolstrip.AddButton(editor.Icons.Import32, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
+            _toolstrip.AddButton(editor.Icons.Import64, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.PageScale32, _preview.CenterView).LinkTooltip("Center view");
+            _toolstrip.AddButton(editor.Icons.CenterView64, _preview.CenterView).LinkTooltip("Center view");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/JsonAssetWindow.cs

@@ -33,10 +33,10 @@ namespace FlaxEditor.Windows.Assets
             _undo.RedoDone += OnUndoRedo;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
 
             // Panel
             var panel = new Panel(ScrollBars.Vertical)

Source/Editor/Windows/Assets/MaterialFunctionWindow.cs

@@ -29,7 +29,7 @@ namespace FlaxEditor.Windows.Assets
 
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/index.html")).LinkTooltip("See documentation to learn more");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/MaterialInstanceWindow.cs

@@ -327,14 +327,14 @@ namespace FlaxEditor.Windows.Assets
             _undo.ActionDone += OnAction;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(Editor.Icons.Rotate32, OnRevertAllParameters).LinkTooltip("Revert all the parameters to the default values");
+            _toolstrip.AddButton(Editor.Icons.Rotate64, OnRevertAllParameters).LinkTooltip("Revert all the parameters to the default values");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/instanced-materials/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/instanced-materials/index.html")).LinkTooltip("See documentation to learn more");
 
             // Split Panel
             _split = new SplitPanel(Orientation.Horizontal, ScrollBars.None, ScrollBars.Vertical)

Source/Editor/Windows/Assets/MaterialWindow.cs

@@ -233,8 +233,8 @@ namespace FlaxEditor.Windows.Assets
 
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.BracketsSlash32, ShowSourceCode).LinkTooltip("Show generated shader source code");
+            _toolstrip.AddButton(editor.Icons.Code64, ShowSourceCode).LinkTooltip("Show generated shader source code");
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/materials/index.html")).LinkTooltip("See documentation to learn more");
         }
 
         private void ShowSourceCode()

Source/Editor/Windows/Assets/ModelBaseWindow.cs

@@ -102,7 +102,7 @@ namespace FlaxEditor.Windows.Assets
         : base(editor, item)
         {
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
 
             // Split Panel
             _split = new SplitPanel(Orientation.Horizontal, ScrollBars.None, ScrollBars.None)

Source/Editor/Windows/Assets/ModelWindow.cs

@@ -824,7 +824,7 @@ namespace FlaxEditor.Windows.Assets
         {
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/models/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/models/index.html")).LinkTooltip("See documentation to learn more");
 
             // Model preview
             _preview = new Preview(this)

Source/Editor/Windows/Assets/ParticleEmitterFunctionWindow.cs

@@ -29,7 +29,7 @@ namespace FlaxEditor.Windows.Assets
 
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/ParticleEmitterWindow.cs

@@ -139,8 +139,8 @@ namespace FlaxEditor.Windows.Assets
 
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.BracketsSlash32, ShowSourceCode).LinkTooltip("Show generated shader source code");
+            _toolstrip.AddButton(editor.Icons.Code64, ShowSourceCode).LinkTooltip("Show generated shader source code");
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
         }
 
         private void ShowSourceCode()

Source/Editor/Windows/Assets/ParticleSystemWindow.cs

@@ -356,12 +356,12 @@ namespace FlaxEditor.Windows.Assets
             propertiesEditor.Select(new GeneralProxy(this));
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/particles/index.html")).LinkTooltip("See documentation to learn more");
 
             // Setup input actions
             InputActions.Add(options => options.Undo, _undo.PerformUndo);

Source/Editor/Windows/Assets/PrefabWindow.cs

@@ -154,16 +154,16 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Modified += MarkAsEdited;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _toolStripUndo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _toolStripUndo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _toolStripRedo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _toolStripRedo = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
             _toolStripTranslate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Translate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Translate).LinkTooltip("Change Gizmo tool mode to Translate (1)");
             _toolStripRotate = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Rotate32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)");
             _toolStripScale = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Scale32, () => _viewport.TransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)");
             _toolstrip.AddSeparator();
-            _toolStripLiveReload = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Reload32, () => LiveReload = !LiveReload).SetChecked(true).SetAutoCheck(true).LinkTooltip("Live changes preview (applies prefab changes on modification by auto)");
+            _toolStripLiveReload = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Refresh64, () => LiveReload = !LiveReload).SetChecked(true).SetAutoCheck(true).LinkTooltip("Live changes preview (applies prefab changes on modification by auto)");
 
             Editor.Prefabs.PrefabApplied += OnPrefabApplied;
             ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;

Source/Editor/Windows/Assets/PreviewsCacheWindow.cs

@@ -28,7 +28,7 @@ namespace FlaxEditor.Windows.Assets
             };
 
             // Toolstrip
-            _toolstrip.AddButton(editor.Icons.PageScale32, _preview.CenterView).LinkTooltip("Center view");
+            _toolstrip.AddButton(editor.Icons.CenterView64, _preview.CenterView).LinkTooltip("Center view");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/SceneAnimationWindow.cs

@@ -634,14 +634,14 @@ namespace FlaxEditor.Windows.Assets
             _timeline.PlayerChanged += OnTimelinePlayerChanged;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _renderButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Build32, OnRenderButtonClicked).LinkTooltip("Open the scene animation rendering utility...");
+            _renderButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Build64, OnRenderButtonClicked).LinkTooltip("Open the scene animation rendering utility...");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/scene-animations/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/scene-animations/index.html")).LinkTooltip("See documentation to learn more");
 
             // Preview player picker
             var previewPlayerPickerContainer = new ContainerControl();

Source/Editor/Windows/Assets/SkeletonMaskWindow.cs

@@ -182,9 +182,9 @@ namespace FlaxEditor.Windows.Assets
         : base(editor, item)
         {
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save asset to the file");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save asset to the file");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/skeleton-mask.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/skeleton-mask.html")).LinkTooltip("See documentation to learn more");
 
             // Split Panel
             _split = new SplitPanel(Orientation.Horizontal, ScrollBars.None, ScrollBars.Vertical)

Source/Editor/Windows/Assets/SkinnedModelWindow.cs

@@ -919,9 +919,9 @@ namespace FlaxEditor.Windows.Assets
         {
             // Toolstrip
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Bone32, () => _preview.ShowNodes = !_preview.ShowNodes).SetAutoCheck(true).LinkTooltip("Show animated model nodes debug view");
+            _toolstrip.AddButton(editor.Icons.Bone64, () => _preview.ShowNodes = !_preview.ShowNodes).SetAutoCheck(true).LinkTooltip("Show animated model nodes debug view");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/skinned-model/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/animation/skinned-model/index.html")).LinkTooltip("See documentation to learn more");
 
             // Model preview
             _preview = new Preview(this)

Source/Editor/Windows/Assets/SpriteAtlasWindow.cs

@@ -264,10 +264,10 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Modified += MarkAsEdited;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
-            _toolstrip.AddButton(editor.Icons.Import32, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
+            _toolstrip.AddButton(editor.Icons.Import64, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.AddDoc32, () =>
+            _toolstrip.AddButton(editor.Icons.AddFile64, () =>
             {
                 var sprite = new Sprite
                 {
@@ -280,7 +280,7 @@ namespace FlaxEditor.Windows.Assets
                 _propertiesEditor.BuildLayout();
             }).LinkTooltip("Add a new sprite");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.PageScale32, _preview.CenterView).LinkTooltip("Center view");
+            _toolstrip.AddButton(editor.Icons.CenterView64, _preview.CenterView).LinkTooltip("Center view");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/TextureWindow.cs

@@ -140,11 +140,11 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Select(_properties);
 
             // Toolstrip
-            _toolstrip.AddButton(Editor.Icons.Import32, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
+            _toolstrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.Reimport((BinaryAssetItem)Item)).LinkTooltip("Reimport");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(Editor.Icons.PageScale32, _preview.CenterView).LinkTooltip("Center view");
+            _toolstrip.AddButton(Editor.Icons.CenterView64, _preview.CenterView).LinkTooltip("Center view");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/textures/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/graphics/textures/index.html")).LinkTooltip("See documentation to learn more");
         }
 
         /// <inheritdoc />

Source/Editor/Windows/Assets/VisjectFunctionSurfaceWindow.cs

@@ -68,12 +68,12 @@ namespace FlaxEditor.Windows.Assets
             _undo.ActionDone += OnUndoRedo;
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.PageScale32, ShowWholeGraph).LinkTooltip("Show whole graph");
+            _toolstrip.AddButton(editor.Icons.CenterView64, ShowWholeGraph).LinkTooltip("Show whole graph");
 
             // Panel
             _panel = new Panel(ScrollBars.None)

Source/Editor/Windows/Assets/VisualScriptWindow.cs

@@ -212,7 +212,7 @@ namespace FlaxEditor.Windows.Assets
                     IsScrollable = false,
                     Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
                     Margin = new Margin(1),
-                    Brush = new SpriteBrush(Editor.Instance.Icons.Add48),
+                    Brush = new SpriteBrush(Editor.Instance.Icons.Add64),
                 };
                 addNewFunction.Clicked += OnAddNewFunctionClicked;
 
@@ -227,7 +227,7 @@ namespace FlaxEditor.Windows.Assets
                     IsScrollable = false,
                     Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
                     Margin = new Margin(1),
-                    Brush = new SpriteBrush(Editor.Instance.Icons.Import32),
+                    Brush = new SpriteBrush(Editor.Instance.Icons.Import64),
                 };
                 overrideMethod.Clicked += OnOverrideMethodClicked;
             }
@@ -385,23 +385,23 @@ namespace FlaxEditor.Windows.Assets
             _propertiesEditor.Select(_properties);
 
             // Toolstrip
-            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save32, Save).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Save64, Save).LinkTooltip("Save");
             _toolstrip.AddSeparator();
-            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo32, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
+            _undoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Undo64, _undo.PerformUndo).LinkTooltip("Undo (Ctrl+Z)");
-            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo32, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
+            _redoButton = (ToolStripButton)_toolstrip.AddButton(Editor.Icons.Redo64, _undo.PerformRedo).LinkTooltip("Redo (Ctrl+Y)");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.PageScale32, ShowWholeGraph).LinkTooltip("Show whole graph");
+            _toolstrip.AddButton(editor.Icons.CenterView64, ShowWholeGraph).LinkTooltip("Show whole graph");
             _toolstrip.AddSeparator();
-            _toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/scripting/visual/index.html")).LinkTooltip("See documentation to learn more");
+            _toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/scripting/visual/index.html")).LinkTooltip("See documentation to learn more");
             _debugToolstripControls = new[]
             {
                 _toolstrip.AddSeparator(),
-                _toolstrip.AddButton(editor.Icons.Play32, OnDebuggerContinue).LinkTooltip("Continue (F5)"),
+                _toolstrip.AddButton(editor.Icons.Play64, OnDebuggerContinue).LinkTooltip("Continue (F5)"),
-                _toolstrip.AddButton(editor.Icons.Find32, OnDebuggerNavigateToCurrentNode).LinkTooltip("Navigate to the current stack trace node"),
+                _toolstrip.AddButton(editor.Icons.Search64, OnDebuggerNavigateToCurrentNode).LinkTooltip("Navigate to the current stack trace node"),
-                _toolstrip.AddButton(editor.Icons.ArrowRight32, OnDebuggerStepOver).LinkTooltip("Step Over (F10)"),
+                _toolstrip.AddButton(editor.Icons.Right64, OnDebuggerStepOver).LinkTooltip("Step Over (F10)"),
-                _toolstrip.AddButton(editor.Icons.ArrowDown32, OnDebuggerStepInto).LinkTooltip("Step Into (F11)"),
+                _toolstrip.AddButton(editor.Icons.Down64, OnDebuggerStepInto).LinkTooltip("Step Into (F11)"),
-                _toolstrip.AddButton(editor.Icons.ArrowUp32, OnDebuggerStepOut).LinkTooltip("Step Out (Shift+F11)"),
+                _toolstrip.AddButton(editor.Icons.Up64, OnDebuggerStepOut).LinkTooltip("Step Out (Shift+F11)"),
-                _toolstrip.AddButton(editor.Icons.Stop32, OnDebuggerStop).LinkTooltip("Stop debugging"),
+                _toolstrip.AddButton(editor.Icons.Stop64, OnDebuggerStop).LinkTooltip("Stop debugging"),
             };
             foreach (var control in _debugToolstripControls)
                 control.Visible = false;

Source/Editor/Windows/ContentWindow.cs

@@ -77,11 +77,11 @@ namespace FlaxEditor.Windows
             {
                 Parent = this,
             };
-            _importButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Import32, () => Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder)).LinkTooltip("Import content");
+            _importButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Import64, () => Editor.ContentImporting.ShowImportFileDialog(CurrentViewFolder)).LinkTooltip("Import content");
             _toolStrip.AddSeparator();
-            _navigateBackwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.ArrowLeft32, NavigateBackward).LinkTooltip("Navigate backward");
+            _navigateBackwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Left64, NavigateBackward).LinkTooltip("Navigate backward");
-            _navigateForwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.ArrowRight32, NavigateForward).LinkTooltip("Navigate forward");
+            _navigateForwardButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Right64, NavigateForward).LinkTooltip("Navigate forward");
-            _navigateUpButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.ArrowUp32, NavigateUp).LinkTooltip("Navigate up");
+            _navigateUpButton = (ToolStripButton)_toolStrip.AddButton(Editor.Icons.Up64, NavigateUp).LinkTooltip("Navigate up");
 
             // Navigation bar
             _navigationBar = new NavigationBar

Source/Editor/Windows/DebugLogWindow.cs

@@ -312,9 +312,9 @@ namespace FlaxEditor.Windows
             _clearOnPlayButton = (ToolStripButton)toolstrip.AddButton("Clear on Play").SetAutoCheck(true).SetChecked(true).LinkTooltip("Clears all log entries on enter playmode");
             _pauseOnErrorButton = (ToolStripButton)toolstrip.AddButton("Pause on Error").SetAutoCheck(true).LinkTooltip("Performs auto pause on error");
             toolstrip.AddSeparator();
-            _groupButtons[0] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Error32, () => UpdateLogTypeVisibility(LogGroup.Error, _groupButtons[0].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides error messages");
+            _groupButtons[0] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Error64, () => UpdateLogTypeVisibility(LogGroup.Error, _groupButtons[0].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides error messages");
-            _groupButtons[1] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Warning32, () => UpdateLogTypeVisibility(LogGroup.Warning, _groupButtons[1].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides warning messages");
+            _groupButtons[1] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Warning64, () => UpdateLogTypeVisibility(LogGroup.Warning, _groupButtons[1].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides warning messages");
-            _groupButtons[2] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Info32, () => UpdateLogTypeVisibility(LogGroup.Info, _groupButtons[2].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides info messages");
+            _groupButtons[2] = (ToolStripButton)toolstrip.AddButton(editor.Icons.Info64, () => UpdateLogTypeVisibility(LogGroup.Info, _groupButtons[2].Checked)).SetAutoCheck(true).SetChecked(true).LinkTooltip("Shows/hides info messages");
             UpdateCount();
 
             // Split panel
@@ -348,9 +348,9 @@ namespace FlaxEditor.Windows
             };
 
             // Cache entries icons
-            IconInfo = Editor.Icons.Info32;
+            IconInfo = Editor.Icons.Info64;
-            IconWarning = Editor.Icons.Warning32;
+            IconWarning = Editor.Icons.Warning64;
-            IconError = Editor.Icons.Error32;
+            IconError = Editor.Icons.Error64;
 
             // Bind events
             Editor.Options.OptionsChanged += OnEditorOptionsChanged;

Source/Editor/Windows/EditorOptionsWindow.cs

@@ -38,7 +38,7 @@ namespace FlaxEditor.Windows
             {
                 Parent = this
             };
-            _saveButton = (ToolStripButton)toolstrip.AddButton(editor.Icons.Save32, SaveData).LinkTooltip("Save");
+            _saveButton = (ToolStripButton)toolstrip.AddButton(editor.Icons.Save64, SaveData).LinkTooltip("Save");
             _saveButton.Enabled = false;
 
             _tabs = new Tabs

Source/Editor/Windows/PluginsWindow.cs

@@ -53,7 +53,7 @@ namespace FlaxEditor.Windows
 
                 var iconImage = new Image
                 {
-                    Brush = new SpriteBrush(Editor.Instance.Icons.Plugin64),
+                    Brush = new SpriteBrush(Editor.Instance.Icons.Plugin128),
                     Parent = this,
                     Bounds = new Rectangle(margin, margin, iconSize, iconSize),
                 };

Source/Editor/Windows/Profiler/ProfilerWindow.cs

@@ -92,20 +92,20 @@ namespace FlaxEditor.Windows.Profiler
             {
                 Parent = this,
             };
-            _liveRecordingButton = toolstrip.AddButton(editor.Icons.Play32);
+            _liveRecordingButton = toolstrip.AddButton(editor.Icons.Play64);
             _liveRecordingButton.LinkTooltip("Live profiling events recording");
             _liveRecordingButton.AutoCheck = true;
             _clearButton = toolstrip.AddButton(editor.Icons.Rotate32, Clear);
             _clearButton.LinkTooltip("Clear data");
             toolstrip.AddSeparator();
-            _prevFrameButton = toolstrip.AddButton(editor.Icons.ArrowLeft32, () => ViewFrameIndex--);
+            _prevFrameButton = toolstrip.AddButton(editor.Icons.Left64, () => ViewFrameIndex--);
             _prevFrameButton.LinkTooltip("Previous frame");
-            _nextFrameButton = toolstrip.AddButton(editor.Icons.ArrowRight32, () => ViewFrameIndex++);
+            _nextFrameButton = toolstrip.AddButton(editor.Icons.Right64, () => ViewFrameIndex++);
             _nextFrameButton.LinkTooltip("Next frame");
-            _lastFrameButton = toolstrip.AddButton(editor.Icons.Step32, () => ViewFrameIndex = -1);
+            _lastFrameButton = toolstrip.AddButton(editor.Icons.Skip64, () => ViewFrameIndex = -1);
             _lastFrameButton.LinkTooltip("Current frame");
             toolstrip.AddSeparator();
-            _showOnlyLastUpdateEventsButton = toolstrip.AddButton(editor.Icons.PageScale32, () => ShowOnlyLastUpdateEvents = !ShowOnlyLastUpdateEvents);
+            _showOnlyLastUpdateEventsButton = toolstrip.AddButton(editor.Icons.CenterView64, () => ShowOnlyLastUpdateEvents = !ShowOnlyLastUpdateEvents);
             _showOnlyLastUpdateEventsButton.LinkTooltip("Show only last update events and hide events from the other callbacks (e.g. draw or fixed update)");
 
             _tabs = new Tabs

Source/Editor/Windows/ToolboxWindow.cs

@@ -319,10 +319,10 @@ namespace FlaxEditor.Windows
                 Parent = this
             };
 
-            TabsControl.AddTab(Spawn = new SpawnTab(Editor.Icons.Add48, Editor));
+            TabsControl.AddTab(Spawn = new SpawnTab(Editor.Icons.Toolbox96, Editor));
-            TabsControl.AddTab(VertexPaint = new VertexPaintingTab(Editor.Icons.Paint48, Editor));
+            TabsControl.AddTab(VertexPaint = new VertexPaintingTab(Editor.Icons.Paint96, Editor));
-            TabsControl.AddTab(Foliage = new FoliageTab(Editor.Icons.Foliage48, Editor));
+            TabsControl.AddTab(Foliage = new FoliageTab(Editor.Icons.Foliage96, Editor));
-            TabsControl.AddTab(Carve = new CarveTab(Editor.Icons.Mountain48, Editor));
+            TabsControl.AddTab(Carve = new CarveTab(Editor.Icons.Terrain96, Editor));
 
             TabsControl.SelectedTabIndex = 0;
         }

Source/Editor/Windows/VisualScriptDebuggerWindow.cs

@@ -404,13 +404,13 @@ namespace FlaxEditor.Windows
             {
                 Parent = this
             };
-            toolstrip.AddButton(editor.Icons.Docs32, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/scripting/visual/index.html")).LinkTooltip("See documentation to learn more");
+            toolstrip.AddButton(editor.Icons.Docs64, () => Platform.OpenUrl(Utilities.Constants.DocsUrl + "manual/scripting/visual/index.html")).LinkTooltip("See documentation to learn more");
             _debugToolstripControls = new[]
             {
                 toolstrip.AddSeparator(),
-                toolstrip.AddButton(editor.Icons.Play32, OnDebuggerContinue).LinkTooltip("Continue (F5)"),
+                toolstrip.AddButton(editor.Icons.Play64, OnDebuggerContinue).LinkTooltip("Continue (F5)"),
-                toolstrip.AddButton(editor.Icons.Find32, OnDebuggerNavigateToCurrentNode).LinkTooltip("Navigate to the current stack trace node"),
+                toolstrip.AddButton(editor.Icons.Search64, OnDebuggerNavigateToCurrentNode).LinkTooltip("Navigate to the current stack trace node"),
-                toolstrip.AddButton(editor.Icons.Stop32, OnDebuggerStop).LinkTooltip("Stop debugging"),
+                toolstrip.AddButton(editor.Icons.Stop64, OnDebuggerStop).LinkTooltip("Stop debugging"),
             };
             foreach (var control in _debugToolstripControls)
                 control.Visible = Editor.Simulation.IsDuringBreakpointHang;

Source/Engine/UI/GUI/Style.cs

@@ -224,6 +224,12 @@ namespace FlaxEngine.GUI
         [EditorOrder(320)]
         public SpriteHandle Scale;
 
+        /// <summary>
+        /// The scalar icon.
+        /// </summary>
+        [EditorOrder(330)]
+        public SpriteHandle Scalar;
+
         /// <summary>
         /// The shared tooltip control used by the controls if no custom tooltip is provided.
         /// </summary>