diff --git a/src/OutlookAddin.UI/Dialogs/ComposeFromCaseDialog.xaml b/src/OutlookAddin.UI/Dialogs/ComposeFromCaseDialog.xaml
index c551fb8..9b7d854 100644
--- a/src/OutlookAddin.UI/Dialogs/ComposeFromCaseDialog.xaml
+++ b/src/OutlookAddin.UI/Dialogs/ComposeFromCaseDialog.xaml
@@ -17,7 +17,7 @@
         </Grid.RowDefinitions>
 
         <DockPanel Grid.Row="0" Margin="0,0,0,8" LastChildFill="True">
-            <TextBlock DockPanel.Dock="Right" Text="חפש תיק:" VerticalAlignment="Center" Margin="0,0,8,0" />
+            <TextBlock DockPanel.Dock="Left" Text="חפש תיק:" VerticalAlignment="Center" Margin="0,0,8,0" />
             <TextBox x:Name="SearchBox"
                      Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
                      Padding="6,4"
diff --git a/src/OutlookAddin.UI/Dialogs/FileToCaseDialog.xaml b/src/OutlookAddin.UI/Dialogs/FileToCaseDialog.xaml
index e32c951..9acaa17 100644
--- a/src/OutlookAddin.UI/Dialogs/FileToCaseDialog.xaml
+++ b/src/OutlookAddin.UI/Dialogs/FileToCaseDialog.xaml
@@ -17,7 +17,10 @@
         </Grid.RowDefinitions>
 
         <DockPanel Grid.Row="0" Margin="0,0,0,8" LastChildFill="True">
-            <TextBlock DockPanel.Dock="Right" Text="חיפוש:" VerticalAlignment="Center" Margin="0,0,8,0" />
+            <!-- DockPanel under FlowDirection=RTL flips Dock="Right" to visual
+                 left and vice-versa. Use Dock="Left" so the label renders on
+                 the visual right (start of Hebrew reading order). -->
+            <TextBlock DockPanel.Dock="Left" Text="חיפוש:" VerticalAlignment="Center" Margin="0,0,8,0" />
             <TextBox x:Name="SearchBox"
                      Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
                      Padding="6,4"
diff --git a/src/OutlookAddin/OutlookAddin.csproj b/src/OutlookAddin/OutlookAddin.csproj
index 5908df4..e000ef3 100644
--- a/src/OutlookAddin/OutlookAddin.csproj
+++ b/src/OutlookAddin/OutlookAddin.csproj
@@ -26,16 +26,39 @@
     <NoStandardLibraries>false</NoStandardLibraries>
     <RootNamespace>OutlookAddin</RootNamespace>
     <AssemblyName>MarcusLaw.OutlookAddin</AssemblyName>
-    <LoadBehavior>3</LoadBehavior>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <DefineConstants>VSTO40;UseOfficeInterop</DefineConstants>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <BootstrapperComponentsLocation>HomeSite</BootstrapperComponentsLocation>
     <ResolveComReferenceSilent>true</ResolveComReferenceSilent>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <PublishUrl>C:\Users\Chaim\source\repos\OutlookAddin\Publish\</PublishUrl>
+    <InstallUrl>\\192.168.10.97\Projects\LegalCRM\Add-in\</InstallUrl>
+    <TargetCulture>en</TargetCulture>
+    <ApplicationVersion>1.0.0.0</ApplicationVersion>
+    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>days</UpdateIntervalUnits>
+    <IsWebBootstrapper>False</IsWebBootstrapper>
+    <ProductName>MarcusLaw.OutlookAddin</ProductName>
+    <PublisherName />
+    <SupportUrl />
+    <FriendlyName>MarcusLaw.OutlookAddin</FriendlyName>
+    <OfficeApplicationDescription />
+    <LoadBehavior>3</LoadBehavior>
   </PropertyGroup>
   <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.VSTORuntime.4.0">
       <Visible>False</Visible>
       <ProductName>Microsoft Visual Studio 2010 Tools for Office Runtime %28x86 and x64%29</ProductName>
diff --git a/src/OutlookAddin/Ribbon/ExplorerRibbon.xml b/src/OutlookAddin/Ribbon/ExplorerRibbon.xml
index 15e0342..9829fd3 100644
--- a/src/OutlookAddin/Ribbon/ExplorerRibbon.xml
+++ b/src/OutlookAddin/Ribbon/ExplorerRibbon.xml
@@ -9,7 +9,7 @@
                   screentip="תייק את המייל הנבחר ל-Klear"
                   supertip="פותח חלון חיפוש לבחירת תיק, לקוח או איש קשר ב-Klear, ומתייק את המייל הנבחר אליו."
                   size="large"
-                  imageMso="MeetingForwardToManager"
+                  imageMso="MoveToFolder"
                   onAction="OnFileToEspoCrm"
                   getEnabled="OnGetFileToEspoCrmEnabled" />
           <button id="OpenEspoCrmSettings"
@@ -17,7 +17,7 @@
                   screentip="הגדרות תוסף Klear"
                   supertip="עריכת כתובת השרת, שם המשתמש, מפתח ה-API והעדפות נוספות."
                   size="large"
-                  imageMso="ServerPropertiesDialog"
+                  imageMso="FileOptions"
                   onAction="OnOpenSettings" />
         </group>
       </tab>
diff --git a/src/OutlookAddin/Ribbon/InspectorRibbon.xml b/src/OutlookAddin/Ribbon/InspectorRibbon.xml
index f053ece..ae7627c 100644
--- a/src/OutlookAddin/Ribbon/InspectorRibbon.xml
+++ b/src/OutlookAddin/Ribbon/InspectorRibbon.xml
@@ -9,7 +9,7 @@
                   screentip="פתח את המייל מתיק Klear"
                   supertip="בחר תיק Klear כדי לאכלס את הנמענים ואת הכותרת של המייל הזה, וכדי שהמייל יתויק אוטומטית כששולחים אותו."
                   size="large"
-                  imageMso="MailMergeStartLetters"
+                  imageMso="NewMailMessage"
                   onAction="OnComposeFromCase"
                   getVisible="OnGetComposeFromCaseVisible" />
         </group>