diff --git a/preditor/gui/find_files.py b/preditor/gui/find_files.py
index d31e4cd0..4eb52a84 100644
--- a/preditor/gui/find_files.py
+++ b/preditor/gui/find_files.py
@@ -3,9 +3,11 @@
 from collections import deque
 
 from Qt.QtCore import Qt
+from Qt.QtGui import QIcon
 from Qt.QtWidgets import QApplication, QShortcut, QWidget
 
-from ..gui import loadUi
+from .. import resourcePath
+from . import loadUi
 
 
 class FindFiles(QWidget):
@@ -18,11 +20,29 @@ def __init__(self, parent=None, managers=None, console=None):
 
         loadUi(__file__, self)
 
+        # Set the icons
+        self.uiCaseSensitiveBTN.setIcon(
+            QIcon(resourcePath("img/format-letter-case.svg"))
+        )
+        self.uiCloseBTN.setIcon(QIcon(resourcePath('img/close-thick.png')))
+        self.uiRegexBTN.setIcon(QIcon(resourcePath("img/regex.svg")))
+
+        # Create shortcuts
         self.uiCloseSCT = QShortcut(
             Qt.Key_Escape, self, context=Qt.WidgetWithChildrenShortcut
         )
         self.uiCloseSCT.activated.connect(self.hide)
 
+        self.uiCaseSensitiveSCT = QShortcut(
+            Qt.AltModifier | Qt.Key_C, self, context=Qt.WidgetWithChildrenShortcut
+        )
+        self.uiCaseSensitiveSCT.activated.connect(self.uiCaseSensitiveBTN.toggle)
+
+        self.uiRegexSCT = QShortcut(
+            Qt.AltModifier | Qt.Key_R, self, context=Qt.WidgetWithChildrenShortcut
+        )
+        self.uiRegexSCT.activated.connect(self.uiRegexBTN.toggle)
+
     def activate(self):
         """Called to make this widget ready for the user to interact with."""
         self.show()
@@ -30,7 +50,8 @@ def activate(self):
 
     def find(self):
         find_text = self.uiFindTXT.text()
-        self.insert_text("\nFind in workboxs: {}\n\n".format(find_text))
+        cs = " (case sensitive)" if self.uiCaseSensitiveBTN.isChecked() else ""
+        self.insert_text('\nFind in workboxs: "{}"{}\n\n'.format(find_text, cs))
 
         for manager in self.managers:
             for (
@@ -118,7 +139,14 @@ def search_file_simple(self, editor, path, workbox_id):
         find_text = self.uiFindTXT.text()
         # Ensure the editor text is loaded
         editor.__show__()
-        raw_lines = editor.__text__().splitlines()
+
+        raw_text = editor.__text__()
+        # Handle case-insensitive searching
+        if not self.uiCaseSensitiveBTN.isChecked():
+            find_text = find_text.lower()
+            raw_lines = raw_text.lower()
+
+        raw_lines = raw_text.splitlines()
         # Add enough padding to cover the number of lines in the file
         padding = len(str(len(raw_lines)))
         fmt = "  {{num: >{}}}{{split}} {{line}}".format(padding)
diff --git a/preditor/gui/ui/find_files.ui b/preditor/gui/ui/find_files.ui
index a7a05489..067d1512 100644
--- a/preditor/gui/ui/find_files.ui
+++ b/preditor/gui/ui/find_files.ui
@@ -25,28 +25,37 @@
     <layout class="QHBoxLayout" name="uiFindOptionsLYT">
      <item>
       <widget class="QToolButton" name="uiRegexBTN">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="toolTip">
-        <string>Regex</string>
+        <string>Regex (Alt + R)</string>
        </property>
        <property name="text">
         <string>Regex</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="uiCaseSensitiveBTN">
        <property name="toolTip">
-        <string>Case Sensitive</string>
+        <string>Case Sensitive (Alt + C)</string>
        </property>
        <property name="text">
         <string>Case Sensitive</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QSpinBox" name="uiContextSPN">
        <property name="toolTip">
-        <string>Context Lines</string>
+        <string># of lines of context to show</string>
        </property>
        <property name="buttonSymbols">
         <enum>QAbstractSpinBox::PlusMinus</enum>
diff --git a/preditor/gui/ui/loggerwindow.ui b/preditor/gui/ui/loggerwindow.ui
index 37000c68..1b26ab25 100644
--- a/preditor/gui/ui/loggerwindow.ui
+++ b/preditor/gui/ui/loggerwindow.ui
@@ -134,7 +134,7 @@
    </widget>
    <widget class="QMenu" name="menu_Run">
     <property name="title">
-     <string>&amp;Run</string>
+     <string>Run</string>
     </property>
     <addaction name="uiRunSelectedACT"/>
     <addaction name="uiRunAllACT"/>
diff --git a/preditor/resource/img/README.md b/preditor/resource/img/README.md
index 6649bb0b..17711728 100644
--- a/preditor/resource/img/README.md
+++ b/preditor/resource/img/README.md
@@ -5,3 +5,13 @@
 Converted to multi-resolution icon using: https://convertico.com/svg-to-ico/
 
 Most other icons downloaded from https://materialdesignicons.com/.
+
+Svg icons are preferred as they are plain text files that play nicely with git.
+Please make sure to update the sources table when adding or updating images.
+
+# Sources for resources
+
+| File | Source | Notes | Author |
+|---|---|---|---|
+| ![](preditor/resource/img/format-letter-case.svg) [content-save.svg](preditor/resource/img/format-letter-case.svg) | https://pictogrammers.com/library/mdi/icon/format-letter-case/ |  | [Austin Andrews](https://pictogrammers.com/contributor/Templarian/) |
+| ![](preditor/resource/img/regex.svg) [content-save.svg](preditor/resource/img/regex.svg) | https://pictogrammers.com/library/mdi/icon/regex/ |  | [Doug C. Hardester](https://pictogrammers.com/contributor/r3volution11/) |
diff --git a/preditor/resource/img/format-letter-case.svg b/preditor/resource/img/format-letter-case.svg
new file mode 100644
index 00000000..eaaf7543
--- /dev/null
+++ b/preditor/resource/img/format-letter-case.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.06,18C20,17.83 19.91,17.54 19.86,17.11C19.19,17.81 18.38,18.16 17.45,18.16C16.62,18.16 15.93,17.92 15.4,17.45C14.87,17 14.6,16.39 14.6,15.66C14.6,14.78 14.93,14.1 15.6,13.61C16.27,13.12 17.21,12.88 18.43,12.88H19.83V12.24C19.83,11.75 19.68,11.36 19.38,11.07C19.08,10.78 18.63,10.64 18.05,10.64C17.53,10.64 17.1,10.76 16.75,11C16.4,11.25 16.23,11.54 16.23,11.89H14.77C14.77,11.46 14.92,11.05 15.22,10.65C15.5,10.25 15.93,9.94 16.44,9.71C16.95,9.5 17.5,9.36 18.13,9.36C19.11,9.36 19.87,9.6 20.42,10.09C20.97,10.58 21.26,11.25 21.28,12.11V16C21.28,16.8 21.38,17.42 21.58,17.88V18H20.06M17.66,16.88C18.11,16.88 18.54,16.77 18.95,16.56C19.35,16.35 19.65,16.07 19.83,15.73V14.16H18.7C16.93,14.16 16.04,14.63 16.04,15.57C16.04,16 16.19,16.3 16.5,16.53C16.8,16.76 17.18,16.88 17.66,16.88M5.46,13.71H9.53L7.5,8.29L5.46,13.71M6.64,6H8.36L13.07,18H11.14L10.17,15.43H4.82L3.86,18H1.93L6.64,6Z" /></svg>
diff --git a/preditor/resource/img/regex.svg b/preditor/resource/img/regex.svg
new file mode 100644
index 00000000..feea451d
--- /dev/null
+++ b/preditor/resource/img/regex.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16,16.92C15.67,16.97 15.34,17 15,17C14.66,17 14.33,16.97 14,16.92V13.41L11.5,15.89C11,15.5 10.5,15 10.11,14.5L12.59,12H9.08C9.03,11.67 9,11.34 9,11C9,10.66 9.03,10.33 9.08,10H12.59L10.11,7.5C10.3,7.25 10.5,7 10.76,6.76V6.76C11,6.5 11.25,6.3 11.5,6.11L14,8.59V5.08C14.33,5.03 14.66,5 15,5C15.34,5 15.67,5.03 16,5.08V8.59L18.5,6.11C19,6.5 19.5,7 19.89,7.5L17.41,10H20.92C20.97,10.33 21,10.66 21,11C21,11.34 20.97,11.67 20.92,12H17.41L19.89,14.5C19.7,14.75 19.5,15 19.24,15.24V15.24C19,15.5 18.75,15.7 18.5,15.89L16,13.41V16.92H16V16.92M5,19A2,2 0 0,1 7,17A2,2 0 0,1 9,19A2,2 0 0,1 7,21A2,2 0 0,1 5,19H5Z" /></svg>