diff --git a/resources/css/tooltip.css b/resources/css/tooltip.css
index 5e3dc93c7fb..095bf1caa21 100644
--- a/resources/css/tooltip.css
+++ b/resources/css/tooltip.css
@@ -661,8 +661,3 @@
 .tippy-hover {
   cursor: pointer;
 }
-
-.tippy-popper .tippy-tooltip.extra-padding-y .py-1 {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-}
diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs
index 021351b395e..31236152f93 100644
--- a/src/main/frontend/components/header.cljs
+++ b/src/main/frontend/components/header.cljs
@@ -31,7 +31,6 @@
    {:html [:div.text-sm.font-medium (ui/keyboard-shortcut-from-config :go/home)]
     :interactive true
     :position    "left"
-    :theme       "extra-padding-y"
     :arrow       true}
    [:a.button
     {:href     (rfe/href :home)
@@ -135,7 +134,6 @@
     {:html [:div.text-sm.font-medium (ui/keyboard-shortcut-from-config :go/backward)]
      :interactive true
      :position    "bottom"
-     :theme       "extra-padding-y"
      :arrow       true}
     [:a.it.navigation.nav-left.button
      {:title "Go back" :on-click #(js/window.history.back)}
@@ -145,7 +143,6 @@
     {:html [:div.text-sm.font-medium (ui/keyboard-shortcut-from-config :go/forward)]
      :interactive true
      :position    "bottom"
-     :theme       "extra-padding-y"
      :arrow       true}
     [:a.it.navigation.nav-right.button
      {:title "Go forward" :on-click #(js/window.history.forward)}
diff --git a/src/main/frontend/components/right_sidebar.cljs b/src/main/frontend/components/right_sidebar.cljs
index aaef180ed76..f405542bd39 100644
--- a/src/main/frontend/components/right_sidebar.cljs
+++ b/src/main/frontend/components/right_sidebar.cljs
@@ -26,7 +26,6 @@
       {:html [:div.text-sm.font-medium
               (ui/keyboard-shortcut-from-config :ui/toggle-right-sidebar)]
        :position    "left"
-       :theme       "extra-padding-y"
        :interactive true
        :arrow       true}
 
diff --git a/src/main/frontend/components/search.cljs b/src/main/frontend/components/search.cljs
index b7ec8087890..16fee2da583 100644
--- a/src/main/frontend/components/search.cljs
+++ b/src/main/frontend/components/search.cljs
@@ -279,7 +279,6 @@
                       (ui/keyboard-shortcut-from-config :go/search-in-page)]
                :arrow           true
                :interactive     true
-               :theme           "extra-padding-y"
                }
               [:div.flex-row.flex.align-items
                [:div.mr-2 "Search in page:"]
@@ -293,7 +292,6 @@
                                  "Tip: " [:code (util/->platform-shortcut "Ctrl + Shift + p")] " to open the commands palette"]
                           :interactive     true
                           :arrow           true
-                          :theme           "extra-padding-y"
                           }
                          [:a.inline-block.fade-link
                           {:style {:margin-left 12}
diff --git a/src/main/frontend/modules/shortcut/data_helper.cljs b/src/main/frontend/modules/shortcut/data_helper.cljs
index 6f6688b6166..c1827b1cfc7 100644
--- a/src/main/frontend/modules/shortcut/data_helper.cljs
+++ b/src/main/frontend/modules/shortcut/data_helper.cljs
@@ -99,6 +99,7 @@
       (str/replace "shift+/" "?")
       (str/replace "left" "←")
       (str/replace "right" "→")
+      (str/replace "+" " ")
       (str/replace "open-square-bracket" "[")
       (str/replace "close-square-bracket" "]")
       (str/lower-case)))
diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs
index 54c9ddee938..07557402e66 100644
--- a/src/main/frontend/ui.cljs
+++ b/src/main/frontend/ui.cljs
@@ -465,7 +465,7 @@
   (let [default-binding (:binding (get shortcut-config/all-default-keyboard-shortcuts shortcut-name))
         custom-binding  (when (state/shortcuts) (get (state/shortcuts) shortcut-name))
         binding         (or custom-binding default-binding)]
-    (render-keyboard-shortcut (shortcut-helper/decorate-binding binding))))
+    (shortcut-helper/decorate-binding binding)))
 
 (defonce modal-show? (atom false))
 (rum/defc modal-overlay
@@ -721,7 +721,7 @@
                              (when-let [html (:html opts)]
                                (if (fn? html)
                                  (html)
-                                 [:div.px-2.py-2
+                                 [:div.px-2.py-1
                                   html]))
                              (catch js/Error e
                                (log/error :exception e)