diff --git a/CustomWidgets/InlineTitleEdit.cs b/CustomWidgets/InlineTitleEdit.cs
index d58efb032..ea210feb6 100644
--- a/CustomWidgets/InlineTitleEdit.cs
+++ b/CustomWidgets/InlineTitleEdit.cs
@@ -29,6 +29,7 @@ either expressed or implied, of the FreeBSD Project.
 
 using System;
 using MatterHackers.Agg;
+using MatterHackers.Agg.Platform;
 using MatterHackers.Agg.UI;
 using MatterHackers.Localizations;
 using MatterHackers.MatterControl.PartPreviewWindow;
@@ -41,8 +42,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
 		public event EventHandler TitleChanged;
 
 		private TextWidget titleText;
-		private TextButton editButton;
-		private TextButton saveButton;
+		private GuiWidget editButton;
+		private GuiWidget saveButton;
 		private SearchInputBox searchPanel;
 
 		public InlineTitleEdit(string title, ThemeConfig theme, bool boldFont = false)
@@ -64,7 +65,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			this.ActionArea.VAnchor = VAnchor.Stretch;
 			this.ActionArea.MinimumSize = new VectorMath.Vector2(0, titleText.Height);
 
-			saveButton = new TextButton("Save".Localize(), theme);
+			saveButton = new IconButton(AggContext.StaticData.LoadIcon("fa-save_16.png", 16, 16, IconColor.Theme), theme)
+			{
+				ToolTipText = "Save".Localize(),
+				Visible = false
+			};
 
 			searchPanel = new SearchInputBox()
 			{
@@ -77,15 +82,21 @@ namespace MatterHackers.MatterControl.CustomWidgets
 				this.SetVisibility(showEditPanel: false);
 				this.TitleChanged?.Invoke(this, null);
 			};
-			searchPanel.resetButton.Click += (s, e) =>
+
+			searchPanel.ResetButton.Name = "Close Title Edit";
+			searchPanel.ResetButton.ToolTipText = "Close".Localize();
+			searchPanel.ResetButton.Click += (s, e) =>
 			{
 				this.SetVisibility(showEditPanel: false);
 			};
 			this.AddChild(searchPanel);
 
 			var rightPanel = new FlowLayoutWidget();
-			editButton = new TextButton("Edit".Localize(), theme);
-			editButton.BackgroundColor = theme.MinimalShade;
+
+			editButton = new IconButton(AggContext.StaticData.LoadIcon("icon_edit.png", 16, 16, IconColor.Theme), theme)
+			{
+				ToolTipText = "Edit".Localize(),
+			};
 			editButton.Click += (s, e) =>
 			{
 				searchPanel.Text = this.Text;
@@ -93,8 +104,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			};
 			rightPanel.AddChild(editButton);
 
-			saveButton.Visible = false;
-			saveButton.BackgroundColor = theme.MinimalShade;
 			saveButton.Click += (s, e) =>
 			{
 				this.Text = searchPanel.Text;
diff --git a/Library/Widgets/PrintLibraryWidget.cs b/Library/Widgets/PrintLibraryWidget.cs
index a9866d104..f543f2e44 100644
--- a/Library/Widgets/PrintLibraryWidget.cs
+++ b/Library/Widgets/PrintLibraryWidget.cs
@@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
 			{
 				this.PerformSearch();
 			};
-			searchPanel.resetButton.Click += (s, e) =>
+			searchPanel.ResetButton.Click += (s, e) =>
 			{
 				breadCrumbWidget.Visible = true;
 				searchPanel.Visible = false;
@@ -850,7 +850,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
 	public class SearchInputBox : GuiWidget
 	{
 		internal MHTextEditWidget searchInput;
-		internal Button resetButton;
+		public Button ResetButton { get; }
 
 		public SearchInputBox()
 		{
@@ -865,13 +865,15 @@ namespace MatterHackers.MatterControl.PrintLibrary
 			};
 			this.AddChild(searchInput);
 
-			resetButton = ApplicationController.Instance.Theme.CreateSmallResetButton();
+			var resetButton = ApplicationController.Instance.Theme.CreateSmallResetButton();
 			resetButton.HAnchor = HAnchor.Right | HAnchor.Fit;
 			resetButton.VAnchor = VAnchor.Center | VAnchor.Fit;
 			resetButton.Name = "Close Search";
 			resetButton.ToolTipText = "Clear".Localize();
 
 			this.AddChild(resetButton);
+
+			this.ResetButton = resetButton;
 		}
 
 		public override string Text
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index 51d0ce689..6e40268b6 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -234,7 +234,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 				this.ShowFilteredView();
 			};
-			searchPanel.resetButton.Click += (s, e) =>
+			searchPanel.ResetButton.Click += (s, e) =>
 			{
 				searchPanel.Visible = false;
 				searchPanel.searchInput.Text = "";
diff --git a/StaticData/Icons/fa-save_16.png b/StaticData/Icons/fa-save_16.png
new file mode 100644
index 000000000..92c5342b3
Binary files /dev/null and b/StaticData/Icons/fa-save_16.png differ