diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json
index 333811db2..90ebd3bf3 100644
--- a/frontend/resources/locales.json
+++ b/frontend/resources/locales.json
@@ -3635,13 +3635,13 @@
       "es" : "Recursos (Ctrl + I)"
     }
   },
-  "workspace.toolbar.circle" : {
+  "workspace.toolbar.ellipse" : {
     "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:69" ],
     "translations" : {
-      "en" : "Circle (E)",
-      "fr" : "Cercle (E)",
-      "ru" : "Круг  (E)",
-      "es" : "Círculo (E)"
+      "en" : "Ellipse (E)",
+      "fr" : "",
+      "ru" : "",
+      "es" : "Elipse (E)"
     }
   },
   "workspace.toolbar.color-palette" : {
@@ -3708,10 +3708,10 @@
   "workspace.toolbar.rect" : {
     "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:64" ],
     "translations" : {
-      "en" : "Box (B)",
-      "fr" : "Boîte (B)",
-      "ru" : "Прямоугольник (B)",
-      "es" : "Recuadro (B)"
+      "en" : "Rectangle (R)",
+      "fr" : "",
+      "ru" : "",
+      "es" : "Rectángulo (R)"
     }
   },
   "workspace.toolbar.text" : {
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index ecc17a715..e66eb73d8 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -1651,7 +1651,7 @@
    "ctrl+y" #(st/emit! dwc/redo)
    "ctrl+q" #(st/emit! dwc/reinitialize-undo)
    "a" #(st/emit! (dwd/select-for-drawing :frame))
-   "b" #(st/emit! (dwd/select-for-drawing :rect))
+   "r" #(st/emit! (dwd/select-for-drawing :rect))
    "e" #(st/emit! (dwd/select-for-drawing :circle))
    "t" #(st/emit! dwtxt/start-edit-if-selected
                   (dwd/select-for-drawing :text))
diff --git a/frontend/src/app/main/ui/workspace/left_toolbar.cljs b/frontend/src/app/main/ui/workspace/left_toolbar.cljs
index 9308a5a1e..5137d3fde 100644
--- a/frontend/src/app/main/ui/workspace/left_toolbar.cljs
+++ b/frontend/src/app/main/ui/workspace/left_toolbar.cljs
@@ -66,7 +66,7 @@
          :on-click (partial select-drawtool :rect)}
         i/box]
        [:li.tooltip.tooltip-right
-        {:alt (t locale "workspace.toolbar.circle")
+        {:alt (t locale "workspace.toolbar.ellipse")
          :class (when (= selected-drawtool :circle) "selected")
          :on-click (partial select-drawtool :circle)}
         i/circle]