diff --git a/stylesheets/components/SendStoryModal.scss b/stylesheets/components/SendStoryModal.scss
index c921e5f03..c36b1bae3 100644
--- a/stylesheets/components/SendStoryModal.scss
+++ b/stylesheets/components/SendStoryModal.scss
@@ -50,6 +50,10 @@
     user-select: none;
   }
 
+  &__top-bar-title {
+    flex: 1;
+  }
+
   &__new-story {
     &__button {
       font-weight: 500;
diff --git a/stylesheets/components/Stories.scss b/stylesheets/components/Stories.scss
index 976bc04bc..a2bf23042 100644
--- a/stylesheets/components/Stories.scss
+++ b/stylesheets/components/Stories.scss
@@ -34,12 +34,7 @@
     &__add-story__button {
       height: 20px;
       width: 20px;
-      @include light-theme {
-        @include color-svg('../images/icons/v3/plus/plus.svg', $color-black);
-      }
-      @include dark-theme {
-        @include color-svg('../images/icons/v3/plus/plus.svg', $color-gray-15);
-      }
+      @include color-svg('../images/icons/v3/plus/plus.svg', $color-white);
 
       &:focus {
         @include keyboard-mode {
diff --git a/ts/components/SendStoryModal.tsx b/ts/components/SendStoryModal.tsx
index 5f1eeccd1..c0dcb3c0f 100644
--- a/ts/components/SendStoryModal.tsx
+++ b/ts/components/SendStoryModal.tsx
@@ -893,49 +893,55 @@ export function SendStoryModal({
           />
         </div>
         <div className="SendStoryModal__top-bar">
-          {i18n('icu:stories')}
-          <ContextMenu
-            aria-label={i18n('icu:SendStoryModal__new')}
-            i18n={i18n}
-            menuOptions={[
-              {
-                label: i18n('icu:SendStoryModal__new-custom--title'),
-                description: i18n(
-                  'icu:SendStoryModal__new-custom--description'
-                ),
-                icon: 'SendStoryModal__icon--custom',
-                onClick: () => setPage(Page.ChooseViewers),
-              },
-              {
-                label: i18n('icu:SendStoryModal__new-group--title'),
-                description: i18n('icu:SendStoryModal__new-group--description'),
-                icon: 'SendStoryModal__icon--group',
-                onClick: () => setPage(Page.ChooseGroups),
-              },
-            ]}
-            moduleClassName="SendStoryModal__new-story"
-            popperOptions={{
-              placement: 'bottom',
-              strategy: 'absolute',
-            }}
-            theme={theme === ThemeType.dark ? Theme.Dark : Theme.Light}
-          >
-            {({ openMenu, onKeyDown, ref, menuNode }) => (
-              <div>
-                <Button
-                  ref={ref}
-                  className="SendStoryModal__new-story__button"
-                  variant={ButtonVariant.Secondary}
-                  size={ButtonSize.Small}
-                  onClick={openMenu}
-                  onKeyDown={onKeyDown}
-                >
-                  {i18n('icu:SendStoryModal__new')}
-                </Button>
-                {menuNode}
-              </div>
-            )}
-          </ContextMenu>
+          <div className="SendStoryModal__top-bar-title">
+            {i18n('icu:stories')}
+          </div>
+          <div className="SendStoryModal__top-bar-actions">
+            <ContextMenu
+              aria-label={i18n('icu:SendStoryModal__new')}
+              i18n={i18n}
+              menuOptions={[
+                {
+                  label: i18n('icu:SendStoryModal__new-custom--title'),
+                  description: i18n(
+                    'icu:SendStoryModal__new-custom--description'
+                  ),
+                  icon: 'SendStoryModal__icon--custom',
+                  onClick: () => setPage(Page.ChooseViewers),
+                },
+                {
+                  label: i18n('icu:SendStoryModal__new-group--title'),
+                  description: i18n(
+                    'icu:SendStoryModal__new-group--description'
+                  ),
+                  icon: 'SendStoryModal__icon--group',
+                  onClick: () => setPage(Page.ChooseGroups),
+                },
+              ]}
+              moduleClassName="SendStoryModal__new-story"
+              popperOptions={{
+                placement: 'bottom',
+                strategy: 'absolute',
+              }}
+              theme={theme === ThemeType.dark ? Theme.Dark : Theme.Light}
+            >
+              {({ openMenu, onKeyDown, ref, menuNode }) => (
+                <div>
+                  <Button
+                    ref={ref}
+                    className="SendStoryModal__new-story__button"
+                    variant={ButtonVariant.Secondary}
+                    size={ButtonSize.Small}
+                    onClick={openMenu}
+                    onKeyDown={onKeyDown}
+                  >
+                    {i18n('icu:SendStoryModal__new')}
+                  </Button>
+                  {menuNode}
+                </div>
+              )}
+            </ContextMenu>
+          </div>
         </div>
         {fullList.map(listOrGroup =>
           // only group has a type field
diff --git a/ts/util/filterAndSortConversations.ts b/ts/util/filterAndSortConversations.ts
index c61d38f97..e5994c23f 100644
--- a/ts/util/filterAndSortConversations.ts
+++ b/ts/util/filterAndSortConversations.ts
@@ -93,7 +93,7 @@ function searchConversations(
   searchTerm: string,
   regionCode: string | undefined
 ): ReadonlyArray<Pick<Fuse.FuseResult<ConversationType>, 'item' | 'score'>> {
-  const maybeCommand = searchTerm.match(/^!([^\s]+):(.*)$/);
+  const maybeCommand = searchTerm.match(/^!([^\s:]+)(?::(.*))?$/);
   if (maybeCommand) {
     const [, commandName, query] = maybeCommand;