diff --git a/src/addons/addons-l10n-settings/de.json b/src/addons/addons-l10n-settings/de.json
index f840b61ee..1ea073462 100644
--- a/src/addons/addons-l10n-settings/de.json
+++ b/src/addons/addons-l10n-settings/de.json
@@ -139,6 +139,8 @@
     "editor-colored-context-menus/@name": "Farbige Kontextmenüs",
     "editor-stage-left/@description": "Verschiebt die Bühne auf die linke Seite des Editors.",
     "editor-stage-left/@name": "Bühne links anzeigen",
+    "editor-buttons-reverse-order/@description": "Verschiebt die grüne Flagge und den Stopp-Knopf auf die rechte und den Vollbild-Knopf auf die linke Seite, wie in Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Verkehrte Anordnung von Playersteuerelementen",
     "variable-manager/@description": "Fügt einen Tab neben \"Klänge\" im Editor hinzu, um Variablen und Listen einfach zu aktualisieren.",
     "variable-manager/@name": "Variablenmanager",
     "search-sprites/@description": "Fügt ein Suchfeld zur Figurenleiste hinzu.",
diff --git a/src/addons/addons-l10n-settings/es.json b/src/addons/addons-l10n-settings/es.json
index 113573030..1b5fd4b15 100644
--- a/src/addons/addons-l10n-settings/es.json
+++ b/src/addons/addons-l10n-settings/es.json
@@ -137,6 +137,8 @@
     "editor-colored-context-menus/@name": "Menús coloridos",
     "editor-stage-left/@description": "Mueve el escenario al lado izquierdo del editor.",
     "editor-stage-left/@name": "Mostrar escenario del lado izquierdo",
+    "editor-buttons-reverse-order/@description": "Mueve la bandera verde y el botón de detener a la derecha, y el botón de pantalla completa a la izquierda, como en Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Invertir orden de los controles del proyecto",
     "variable-manager/@description": "Agrega una pestaña al lado de \"sonidos\" en el editor para que pueda fácilmente editar variables y listas.",
     "variable-manager/@name": "Gestor de variables",
     "search-sprites/@description": "Agrega una barra de búsqueda al panel de objetos para buscar objetos por nombre.",
diff --git a/src/addons/addons-l10n-settings/fr.json b/src/addons/addons-l10n-settings/fr.json
index f5601842f..a7dda328d 100644
--- a/src/addons/addons-l10n-settings/fr.json
+++ b/src/addons/addons-l10n-settings/fr.json
@@ -135,6 +135,8 @@
     "editor-colored-context-menus/@name": "Menus déroulants colorés",
     "editor-stage-left/@description": "Déplace la scène sur le côté gauche de l'éditeur.",
     "editor-stage-left/@name": "Afficher la scène sur le côté gauche",
+    "editor-buttons-reverse-order/@description": "Bouge le drapeau vert et le bouton stop sur la droite, et le bouton plein écran à la gauche, comme dans Scratch 2.0",
+    "editor-buttons-reverse-order/@name": "Inverser l'ordre des contrôles du projet",
     "variable-manager/@description": "Ajoute un nouvel onglet à côté de \"sons\" dans l'éditeur pour mettre à jour facilement les variables et les listes.",
     "variable-manager/@name": "Gestionnaire de variables",
     "search-sprites/@description": "Ajoute un champ de recherche au volet des sprites pour les rechercher par nom.",
diff --git a/src/addons/addons-l10n-settings/hu.json b/src/addons/addons-l10n-settings/hu.json
index bfbf7d355..7fd1592c6 100644
--- a/src/addons/addons-l10n-settings/hu.json
+++ b/src/addons/addons-l10n-settings/hu.json
@@ -139,6 +139,8 @@
     "editor-colored-context-menus/@name": "Színezett helyi menük",
     "editor-stage-left/@description": "Áthelyezi a színpadot a szerkesztő bal oldalára.",
     "editor-stage-left/@name": "Színpad áthelyezése bal oldalra",
+    "editor-buttons-reverse-order/@description": "Áthelyezi a zöld zászlót és a megállító gombot a jobboldalra, valamint a teljes képernyő gombot pedig baloldalra, ahogy a Scratch 2.0-ban volt.",
+    "editor-buttons-reverse-order/@name": "Projektirányító gombok fordított sorrendben",
     "variable-manager/@description": "Hozzáad egy fület a \"hangok\" mellé a szerkesztőben, melyben könnyen frissítheted a változókat és listákat.",
     "variable-manager/@name": "Változó kezelő",
     "search-sprites/@description": "Hozzáad egy kereső mezőt a szereplő kijelzőhőz, hogy kereshess a szereplők között név alapján.",
diff --git a/src/addons/addons-l10n-settings/it.json b/src/addons/addons-l10n-settings/it.json
index 8498bc302..1ddd73418 100644
--- a/src/addons/addons-l10n-settings/it.json
+++ b/src/addons/addons-l10n-settings/it.json
@@ -139,6 +139,8 @@
     "editor-colored-context-menus/@name": "Menu contestuali colorati",
     "editor-stage-left/@description": "Sposta lo stage nella parte sinistra dell'editor.",
     "editor-stage-left/@name": "Sposta stage a sinistra",
+    "editor-buttons-reverse-order/@description": "Sposta la bandiera verde e il pulsante di stop a destra e il pulsante modalità presentazione a sinistra, come in Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Inverti l'ordine dei controlli del progetto",
     "variable-manager/@description": "Aggiunge una scheda nell'editor a fianco a \"suoni\" per gestire facilmente variabili e liste.",
     "variable-manager/@name": "Gestore variabili",
     "search-sprites/@description": "Aggiunge una casella di ricerca all'area degli sprite per cercare uno sprite basandosi sul nome.",
diff --git a/src/addons/addons-l10n-settings/ja.json b/src/addons/addons-l10n-settings/ja.json
index 2be0a8bb0..84256eb8d 100644
--- a/src/addons/addons-l10n-settings/ja.json
+++ b/src/addons/addons-l10n-settings/ja.json
@@ -139,6 +139,8 @@
     "editor-colored-context-menus/@name": "右クリックメニューを色付け",
     "editor-stage-left/@description": "ステージを左側に表示する。",
     "editor-stage-left/@name": "ステージを左側に表示",
+    "editor-buttons-reverse-order/@description": "Scratch 2.0のように、緑の旗と停止ボタンを右に、全画面表示ボタンを左に移動させる。",
+    "editor-buttons-reverse-order/@name": "プロジェクト操作ボタン反転",
     "variable-manager/@description": "エディターに変数とリストを管理するためのタブを追加する。",
     "variable-manager/@name": "変数マネージャー",
     "search-sprites/@description": "スプライトペインに、スプライトを名前で検索する項目を追加する。",
diff --git a/src/addons/addons-l10n-settings/nl.json b/src/addons/addons-l10n-settings/nl.json
index 1be3973f0..6e9c4a2d6 100644
--- a/src/addons/addons-l10n-settings/nl.json
+++ b/src/addons/addons-l10n-settings/nl.json
@@ -139,6 +139,8 @@
     "editor-colored-context-menus/@name": "Gekleurde rechterklikmenu's",
     "editor-stage-left/@description": "Zet het speelveld aan de linkerkant van de editor.",
     "editor-stage-left/@name": "Zet speelveld aan linkerkant",
+    "editor-buttons-reverse-order/@description": "Verplaatst de groene vlag en stopknop naar rechts en de volledig scherm-knop naar links, zoals in Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Volgorde van projectbesturingen omkeren",
     "variable-manager/@description": "Voegt een tabblad naast \"geluiden\" toe in de editor om makkelijk variabelen en lijsten aan te passen.",
     "variable-manager/@name": "Variabele manager",
     "search-sprites/@description": "Voegt een zoekbalk aan het spritevenster toe om sprites bij naam te zoeken.",
diff --git a/src/addons/addons-l10n-settings/pl.json b/src/addons/addons-l10n-settings/pl.json
index d1123ad82..0ca5f60ad 100644
--- a/src/addons/addons-l10n-settings/pl.json
+++ b/src/addons/addons-l10n-settings/pl.json
@@ -138,6 +138,8 @@
     "editor-colored-context-menus/@name": "Kolorowe menu zawartości",
     "editor-stage-left/@description": "Przesuwa scenę na lewą stronę edytora.",
     "editor-stage-left/@name": "Przenieś scenę na lewą stronę",
+    "editor-buttons-reverse-order/@description": "Przesuwa zieloną flagę oraz przyciski do zatrzymania na prawą stronę, a przycisk powiększenia ekranu na lewą stronę, tak samo jak w Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Odwrócona kolejność kontrolek projektu",
     "variable-manager/@description": "Dodaje zakładkę obok \"dźwięków\" w edytorze żeby łatwo aktualizować zmienne i listy",
     "variable-manager/@name": "Menedżer zmiennych",
     "search-sprites/@description": "Dodaje pole wyszukiwania w liście duszków, za pomocą którego możesz wyszukać duszka po jego nazwie.",
diff --git a/src/addons/addons-l10n-settings/pt.json b/src/addons/addons-l10n-settings/pt.json
index 742f12bba..d7e4b6e7f 100644
--- a/src/addons/addons-l10n-settings/pt.json
+++ b/src/addons/addons-l10n-settings/pt.json
@@ -138,6 +138,8 @@
     "editor-colored-context-menus/@name": "Menus de contexto coloridos",
     "editor-stage-left/@description": "Move o palco para o lado esquerdo do editor.",
     "editor-stage-left/@name": "Mostrar palco do lado esquerdo",
+    "editor-buttons-reverse-order/@description": "Moverá a bandeira verde e o botão de pare para direita e no modo tela cheia os moverá para a direita, como no Scratch 2.0.",
+    "editor-buttons-reverse-order/@name": "Reverter ordem dos botões de controle de projeto",
     "variable-manager/@description": "Adiciona uma aba do lado de \"Sons\" no editor para facilmente editar variáveis e listas.",
     "variable-manager/@name": "Administrador de variáveis",
     "search-sprites/@description": "Adiciona uma barra de busca ao painel de atores para pesquisar por atores pelo nome.",
diff --git a/src/addons/addons-l10n-settings/sl.json b/src/addons/addons-l10n-settings/sl.json
index 13a5c5b40..d5d758906 100644
--- a/src/addons/addons-l10n-settings/sl.json
+++ b/src/addons/addons-l10n-settings/sl.json
@@ -138,6 +138,8 @@
     "editor-colored-context-menus/@name": "Barvni meniji",
     "editor-stage-left/@description": "Premakne oder na levo stran urejevalnika.",
     "editor-stage-left/@name": "Pokaži oder na levi strani",
+    "editor-buttons-reverse-order/@description": "Premakne zeleno zastavico in gumb Ustavi na desno in gumb za celozaslonski način na desno, kot v Scratchu 2.0.",
+    "editor-buttons-reverse-order/@name": "Obratno zaporedje gumbov za nadzor projekta",
     "variable-manager/@description": "Doda zavihek za enostavno urejanje spremenljivk in seznamov v urejevalnik, poleg zavihka \"zvoki\".",
     "variable-manager/@name": "Upravitelj spremenljivk",
     "search-sprites/@description": "Poleg seznama figur doda polje za iskanje figur glede na ime.",
diff --git a/src/addons/addons-l10n-settings/tr.json b/src/addons/addons-l10n-settings/tr.json
index ac121df10..a173e1f9c 100644
--- a/src/addons/addons-l10n-settings/tr.json
+++ b/src/addons/addons-l10n-settings/tr.json
@@ -140,6 +140,8 @@
     "editor-colored-context-menus/@name": "Renkli bağlam menüleri",
     "editor-stage-left/@description": "Sahneyi editörün sol tarafına taşır.",
     "editor-stage-left/@name": "Sahneyi sol tarafta göster",
+    "editor-buttons-reverse-order/@description": "Scratch 2.0'daki gibi yeşil bayrak ve durdurma düğmelerini sağa, tam ekran düğmesini ise sola götürür.",
+    "editor-buttons-reverse-order/@name": "Ters çevrilmiş proje kontrolleri",
     "variable-manager/@description": "Editörde \"sesler\" sekmesinin yanına değişken ve listelerinizi kolaylıkla yönetebileceğiniz bir sekme ekler.",
     "variable-manager/@name": "Değişken yöneticisi",
     "search-sprites/@description": "Karakterleri ismine göre aramak için kukla bölmesine bir arama kutusu ekler.",
diff --git a/src/addons/addons.js b/src/addons/addons.js
index 68631cce3..edb082d51 100644
--- a/src/addons/addons.js
+++ b/src/addons/addons.js
@@ -27,6 +27,7 @@ const addons = [
     'custom-block-text',
     'editor-colored-context-menus',
     'editor-stage-left',
+    'editor-buttons-reverse-order',
     'variable-manager',
     'search-sprites',
     'gamepad',
@@ -63,7 +64,8 @@ const addons = [
 ];
 
 const newAddons = [
-    'hide-stage'
+    'hide-stage',
+    'editor-buttons-reverse-order'
 ];
 
 // eslint-disable-next-line import/no-commonjs
diff --git a/src/addons/addons/editor-buttons-reverse-order/_manifest_entry.js b/src/addons/addons/editor-buttons-reverse-order/_manifest_entry.js
new file mode 100644
index 000000000..af8f627b3
--- /dev/null
+++ b/src/addons/addons/editor-buttons-reverse-order/_manifest_entry.js
@@ -0,0 +1,16 @@
+/* generated by pull.js */
+const manifest = {
+  "name": "Reverse order of project controls",
+  "description": "Moves the green flag and stop buttons to the right and the full screen button to the left, like in Scratch 2.0.",
+  "tags": [
+    "theme",
+    "new"
+  ],
+  "dynamicDisable": true,
+  "userstyles": [
+    {
+      "url": "userstyle.css"
+    }
+  ]
+};
+export default manifest;
diff --git a/src/addons/addons/editor-buttons-reverse-order/_runtime_entry.js b/src/addons/addons/editor-buttons-reverse-order/_runtime_entry.js
new file mode 100644
index 000000000..7258d9ba2
--- /dev/null
+++ b/src/addons/addons/editor-buttons-reverse-order/_runtime_entry.js
@@ -0,0 +1,5 @@
+/* generated by pull.js */
+import _css from "!css-loader!./userstyle.css";
+export const resources = {
+  "userstyle.css": _css,
+};
diff --git a/src/addons/addons/editor-buttons-reverse-order/userstyle.css b/src/addons/addons/editor-buttons-reverse-order/userstyle.css
new file mode 100644
index 000000000..f72edc66c
--- /dev/null
+++ b/src/addons/addons/editor-buttons-reverse-order/userstyle.css
@@ -0,0 +1,24 @@
+[class*="stage-header_stage-menu-wrapper"],
+[class*="stage-header_stage-size-row"] {
+  flex-direction: row-reverse;
+}
+
+[dir="ltr"] [class*="stage-header_stage-size-toggle-group"],
+[dir="ltr"] .sa-debugger-container,
+[dir="ltr"] .sa-gamepad-container {
+  margin-right: 0;
+  margin-left: 0.2rem;
+}
+
+[dir="rtl"] [class*="stage-header_stage-size-toggle-group"],
+[dir="rtl"] .sa-debugger-container,
+[dir="rtl"] .sa-gamepad-container {
+  margin-left: 0;
+  margin-right: 0.2rem;
+}
+
+[class*="green-flag_green-flag_"],
+[class*="stop-all_stop-all_"],
+.pause-btn {
+  order: 1;
+}
diff --git a/src/addons/generated/addon-entries.js b/src/addons/generated/addon-entries.js
index 9984b2f46..df12c7f5a 100644
--- a/src/addons/generated/addon-entries.js
+++ b/src/addons/generated/addon-entries.js
@@ -26,6 +26,7 @@ export default {
   "custom-block-text": () => import(/* webpackChunkName: "addon-entry-custom-block-text" */ "../addons/custom-block-text/_runtime_entry.js"),
   "editor-colored-context-menus": () => import(/* webpackChunkName: "addon-entry-editor-colored-context-menus" */ "../addons/editor-colored-context-menus/_runtime_entry.js"),
   "editor-stage-left": () => import(/* webpackChunkName: "addon-entry-editor-stage-left" */ "../addons/editor-stage-left/_runtime_entry.js"),
+  "editor-buttons-reverse-order": () => import(/* webpackChunkName: "addon-entry-editor-buttons-reverse-order" */ "../addons/editor-buttons-reverse-order/_runtime_entry.js"),
   "variable-manager": () => import(/* webpackChunkName: "addon-entry-variable-manager" */ "../addons/variable-manager/_runtime_entry.js"),
   "search-sprites": () => import(/* webpackChunkName: "addon-entry-search-sprites" */ "../addons/search-sprites/_runtime_entry.js"),
   "gamepad": () => import(/* webpackChunkName: "addon-entry-gamepad" */ "../addons/gamepad/_runtime_entry.js"),
diff --git a/src/addons/generated/addon-manifests.js b/src/addons/generated/addon-manifests.js
index 9661b5dd6..95dbc524e 100644
--- a/src/addons/generated/addon-manifests.js
+++ b/src/addons/generated/addon-manifests.js
@@ -25,6 +25,7 @@ import _editor_theme3 from "../addons/editor-theme3/_manifest_entry.js";
 import _custom_block_text from "../addons/custom-block-text/_manifest_entry.js";
 import _editor_colored_context_menus from "../addons/editor-colored-context-menus/_manifest_entry.js";
 import _editor_stage_left from "../addons/editor-stage-left/_manifest_entry.js";
+import _editor_buttons_reverse_order from "../addons/editor-buttons-reverse-order/_manifest_entry.js";
 import _variable_manager from "../addons/variable-manager/_manifest_entry.js";
 import _search_sprites from "../addons/search-sprites/_manifest_entry.js";
 import _gamepad from "../addons/gamepad/_manifest_entry.js";
@@ -85,6 +86,7 @@ export default {
   "custom-block-text": _custom_block_text,
   "editor-colored-context-menus": _editor_colored_context_menus,
   "editor-stage-left": _editor_stage_left,
+  "editor-buttons-reverse-order": _editor_buttons_reverse_order,
   "variable-manager": _variable_manager,
   "search-sprites": _search_sprites,
   "gamepad": _gamepad,