Bumped version to 20250901.0

Automation-keybindings (#26762 )
Co-authored-by: Norbert Rittel <norbert@rittel.de> Co-authored-by: Bram Kragten <mail@bramkragten.nl>
2025-09-02 13:00:27 +00:00 · 2025-09-01 21:42:55 +02:00 · 2025-09-01 21:42:19 +02:00 · 2025-09-01 21:41:20 +02:00 · 2025-09-01 21:41:19 +02:00 · 2025-09-01 21:41:18 +02:00
68 changed files with 3220 additions and 1279 deletions
--- a/public/static/images/dashboard-options/dark/icon-dashboard-home.svg
+++ b/public/static/images/dashboard-options/dark/icon-dashboard-home.svg
@@ -0,0 +1,76 @@
+<svg width="160" height="160" viewBox="0 0 160 160" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4744_40067)">
+<path d="M0 6C0 2.68629 2.68629 0 6 0H28C31.3137 0 34 2.68629 34 6C34 9.31371 31.3137 12 28 12H6C2.68629 12 0 9.31371 0 6Z" fill="white" fill-opacity="0.48"/>
+<path d="M0 28C0 23.5817 3.58172 20 8 20H42.6667C47.0849 20 50.6667 23.5817 50.6667 28V36C50.6667 40.4183 47.0849 44 42.6667 44H8.00001C3.58173 44 0 40.4183 0 36V28Z" fill="#1C1C1C"/>
+<path d="M8 20.5H42.667C46.809 20.5002 50.167 23.858 50.167 28V36C50.167 40.142 46.809 43.4998 42.667 43.5H8C3.85787 43.5 0.5 40.1421 0.5 36V28C0.5 23.8579 3.85786 20.5 8 20.5Z" stroke="white" stroke-opacity="0.24"/>
+<path d="M6 32C6 28.6863 8.68629 26 12 26C15.3137 26 18 28.6863 18 32C18 35.3137 15.3137 38 12 38C8.68629 38 6 35.3137 6 32Z" fill="white" fill-opacity="0.24"/>
+<path d="M24 31C24 29.3431 25.3431 28 27 28H39.6667C41.3235 28 42.6667 29.3431 42.6667 31V33C42.6667 34.6569 41.3235 36 39.6667 36H27C25.3431 36 24 34.6569 24 33V31Z" fill="white" fill-opacity="0.24"/>
+<path d="M54.6666 28C54.6666 23.5817 58.2483 20 62.6666 20H97.3333C101.752 20 105.333 23.5817 105.333 28V36C105.333 40.4183 101.752 44 97.3333 44H62.6666C58.2484 44 54.6666 40.4183 54.6666 36V28Z" fill="#1C1C1C"/>
+<path d="M62.6666 20.5H97.3336C101.476 20.5002 104.834 23.858 104.834 28V36C104.834 40.142 101.476 43.4998 97.3336 43.5H62.6666C58.5245 43.5 55.1666 40.1421 55.1666 36V28C55.1666 23.8579 58.5245 20.5 62.6666 20.5Z" stroke="white" stroke-opacity="0.24"/>
+<path d="M60.6666 32C60.6666 28.6863 63.3529 26 66.6666 26C69.9803 26 72.6666 28.6863 72.6666 32C72.6666 35.3137 69.9803 38 66.6666 38C63.3529 38 60.6666 35.3137 60.6666 32Z" fill="white" fill-opacity="0.24"/>
+<path d="M78.6666 31C78.6666 29.3431 80.0098 28 81.6666 28H94.3333C95.9901 28 97.3333 29.3431 97.3333 31V33C97.3333 34.6569 95.9901 36 94.3333 36H81.6666C80.0098 36 78.6666 34.6569 78.6666 33V31Z" fill="white" fill-opacity="0.24"/>
+<path d="M109.333 28C109.333 23.5817 112.915 20 117.333 20H152C156.418 20 160 23.5817 160 28V36C160 40.4183 156.418 44 152 44H117.333C112.915 44 109.333 40.4183 109.333 36V28Z" fill="#1C1C1C"/>
+<path d="M117.333 20.5H152C156.142 20.5002 159.5 23.858 159.5 28V36C159.5 40.142 156.142 43.4998 152 43.5H117.333C113.191 43.5 109.833 40.1421 109.833 36V28C109.833 23.8579 113.191 20.5 117.333 20.5Z" stroke="white" stroke-opacity="0.24"/>
+<path d="M115.333 32C115.333 28.6863 118.02 26 121.333 26C124.647 26 127.333 28.6863 127.333 32C127.333 35.3137 124.647 38 121.333 38C118.02 38 115.333 35.3137 115.333 32Z" fill="white" fill-opacity="0.24"/>
+<path d="M133.333 31C133.333 29.3431 134.677 28 136.333 28H149C150.657 28 152 29.3431 152 31V33C152 34.6569 150.657 36 149 36H136.333C134.677 36 133.333 34.6569 133.333 33V31Z" fill="white" fill-opacity="0.24"/>
+<path d="M0 56C0 53.7909 1.79086 52 4 52H29C31.2091 52 33 53.7909 33 56C33 58.2091 31.2091 60 29 60H4C1.79086 60 0 58.2091 0 56Z" fill="white" fill-opacity="0.48"/>
+<path d="M0 72C0 67.5817 3.58172 64 8 64H29C33.4183 64 37 67.5817 37 72V96C37 100.418 33.4183 104 29 104H8C3.58172 104 0 100.418 0 96V72Z" fill="#1C1C1C"/>
+<path d="M8 64.5H29C33.1421 64.5 36.5 67.8579 36.5 72V96C36.5 100.142 33.1421 103.5 29 103.5H8C3.85786 103.5 0.5 100.142 0.5 96V72C0.5 67.8579 3.85786 64.5 8 64.5Z" stroke="white" stroke-opacity="0.24"/>
+<mask id="mask0_4744_40067" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="72" width="25" height="24">
+<path d="M18.5 74C16.6435 74 14.863 74.7375 13.5503 76.0503C12.2375 77.363 11.5 79.1435 11.5 81C11.5 83.38 12.69 85.47 14.5 86.74V89C14.5 89.2652 14.6054 89.5196 14.7929 89.7071C14.9804 89.8946 15.2348 90 15.5 90H21.5C21.7652 90 22.0196 89.8946 22.2071 89.7071C22.3946 89.5196 22.5 89.2652 22.5 89V86.74C24.31 85.47 25.5 83.38 25.5 81C25.5 79.1435 24.7625 77.363 23.4497 76.0503C22.137 74.7375 20.3565 74 18.5 74ZM15.5 93C15.5 93.2652 15.6054 93.5196 15.7929 93.7071C15.9804 93.8946 16.2348 94 16.5 94H20.5C20.7652 94 21.0196 93.8946 21.2071 93.7071C21.3946 93.5196 21.5 93.2652 21.5 93V92H15.5V93Z" fill="black"/>
+</mask>
+<g mask="url(#mask0_4744_40067)">
+<rect x="6.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M41 72C41 67.5817 44.5817 64 49 64H70C74.4183 64 78 67.5817 78 72V96C78 100.418 74.4183 104 70 104H49C44.5817 104 41 100.418 41 96V72Z" fill="#1C1C1C"/>
+<path d="M49 64.5H70C74.1421 64.5 77.5 67.8579 77.5 72V96C77.5 100.142 74.1421 103.5 70 103.5H49C44.8579 103.5 41.5 100.142 41.5 96V72C41.5 67.8579 44.8579 64.5 49 64.5Z" stroke="white" stroke-opacity="0.24"/>
+<mask id="mask1_4744_40067" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="47" y="72" width="25" height="24">
+<path d="M66.5 80C67.61 80 68.5 80.9 68.5 82V88.76C69.11 89.31 69.5 90.11 69.5 91C69.5 92.66 68.16 94 66.5 94C64.84 94 63.5 92.66 63.5 91C63.5 90.11 63.89 89.31 64.5 88.76V82C64.5 80.9 65.4 80 66.5 80ZM66.5 81C65.95 81 65.5 81.45 65.5 82V83H67.5V82C67.5 81.45 67.05 81 66.5 81ZM52.5 92V84H49.5L59.5 75L63.9 78.96C63.04 79.69 62.5 80.78 62.5 82V88C61.87 88.83 61.5 89.87 61.5 91L61.6 92H52.5Z" fill="black"/>
+</mask>
+<g mask="url(#mask1_4744_40067)">
+<rect x="47.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M82 72C82 67.5817 85.5817 64 90 64H111C115.418 64 119 67.5817 119 72V96C119 100.418 115.418 104 111 104H90C85.5817 104 82 100.418 82 96V72Z" fill="#1C1C1C"/>
+<path d="M90 64.5H111C115.142 64.5 118.5 67.8579 118.5 72V96C118.5 100.142 115.142 103.5 111 103.5H90C85.8579 103.5 82.5 100.142 82.5 96V72C82.5 67.8579 85.8579 64.5 90 64.5Z" stroke="white" stroke-opacity="0.24"/>
+<mask id="mask2_4744_40067" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="88" y="72" width="25" height="24">
+<path d="M100.5 84H107.5C106.97 88.11 104.22 91.78 100.5 92.92V84H93.5V78.3L100.5 75.19M100.5 73L91.5 77V83C91.5 88.55 95.34 93.73 100.5 95C105.66 93.73 109.5 88.55 109.5 83V77L100.5 73Z" fill="black"/>
+</mask>
+<g mask="url(#mask2_4744_40067)">
+<rect x="88.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M123 72C123 67.5817 126.582 64 131 64H152C156.418 64 160 67.5817 160 72V96C160 100.418 156.418 104 152 104H131C126.582 104 123 100.418 123 96V72Z" fill="#1C1C1C"/>
+<path d="M131 64.5H152C156.142 64.5 159.5 67.8579 159.5 72V96C159.5 100.142 156.142 103.5 152 103.5H131C126.858 103.5 123.5 100.142 123.5 96V72C123.5 67.8579 126.858 64.5 131 64.5Z" stroke="white" stroke-opacity="0.24"/>
+<mask id="mask3_4744_40067" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="129" y="72" width="25" height="24">
+<path d="M145.5 84C145.5 83.4696 145.711 82.9609 146.086 82.5858C146.461 82.2107 146.97 82 147.5 82C148.03 82 148.539 82.2107 148.914 82.5858C149.289 82.9609 149.5 83.4696 149.5 84C149.5 84.5304 149.289 85.0391 148.914 85.4142C148.539 85.7893 148.03 86 147.5 86C146.97 86 146.461 85.7893 146.086 85.4142C145.711 85.0391 145.5 84.5304 145.5 84ZM139.5 84C139.5 83.4696 139.711 82.9609 140.086 82.5858C140.461 82.2107 140.97 82 141.5 82C142.03 82 142.539 82.2107 142.914 82.5858C143.289 82.9609 143.5 83.4696 143.5 84C143.5 84.5304 143.289 85.0391 142.914 85.4142C142.539 85.7893 142.03 86 141.5 86C140.97 86 140.461 85.7893 140.086 85.4142C139.711 85.0391 139.5 84.5304 139.5 84ZM133.5 84C133.5 83.4696 133.711 82.9609 134.086 82.5858C134.461 82.2107 134.97 82 135.5 82C136.03 82 136.539 82.2107 136.914 82.5858C137.289 82.9609 137.5 83.4696 137.5 84C137.5 84.5304 137.289 85.0391 136.914 85.4142C136.539 85.7893 136.03 86 135.5 86C134.97 86 134.461 85.7893 134.086 85.4142C133.711 85.0391 133.5 84.5304 133.5 84Z" fill="black"/>
+</mask>
+<g mask="url(#mask3_4744_40067)">
+<rect x="129.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M0 116C0 113.791 1.79086 112 4 112H29C31.2091 112 33 113.791 33 116C33 118.209 31.2091 120 29 120H4C1.79086 120 0 118.209 0 116Z" fill="white" fill-opacity="0.48"/>
+<path d="M0 132C0 127.582 3.58172 124 8 124H70C74.4183 124 78 127.582 78 132V160H0V132Z" fill="url(#paint0_linear_4744_40067)"/>
+<path d="M8 124.5H70C74.1421 124.5 77.5 127.858 77.5 132V159.5H0.5V132C0.5 127.858 3.85786 124.5 8 124.5Z" stroke="url(#paint1_linear_4744_40067)" stroke-opacity="0.12"/>
+<path d="M82 132C82 127.582 85.5817 124 90 124H152C156.418 124 160 127.582 160 132V160H82V132Z" fill="url(#paint2_linear_4744_40067)"/>
+<path d="M90 124.5H152C156.142 124.5 159.5 127.858 159.5 132V159.5H82.5V132C82.5 127.858 85.8579 124.5 90 124.5Z" stroke="url(#paint3_linear_4744_40067)" stroke-opacity="0.12"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_4744_40067" x1="39" y1="124" x2="39" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="#1C1C1C"/>
+<stop offset="1" stop-color="#1C1C1C" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4744_40067" x1="39" y1="124" x2="39" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="white" stop-opacity="0.24"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_4744_40067" x1="121" y1="124" x2="121" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="#1C1C1C"/>
+<stop offset="1" stop-color="#1C1C1C" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_4744_40067" x1="121" y1="124" x2="121" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="white" stop-opacity="0.24"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_4744_40067">
+<rect width="160" height="160" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/public/static/images/dashboard-options/light/icon-dashboard-home.svg
+++ b/public/static/images/dashboard-options/light/icon-dashboard-home.svg
@@ -0,0 +1,76 @@
+<svg width="160" height="160" viewBox="0 0 160 160" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4744_39984)">
+<path d="M0 6C0 2.68629 2.68629 0 6 0H28C31.3137 0 34 2.68629 34 6C34 9.31371 31.3137 12 28 12H6C2.68629 12 0 9.31371 0 6Z" fill="black" fill-opacity="0.32"/>
+<path d="M0 28C0 23.5817 3.58172 20 8 20H42.6667C47.0849 20 50.6667 23.5817 50.6667 28V36C50.6667 40.4183 47.0849 44 42.6667 44H8.00001C3.58173 44 0 40.4183 0 36V28Z" fill="white"/>
+<path d="M8 20.5H42.667C46.809 20.5002 50.167 23.858 50.167 28V36C50.167 40.142 46.809 43.4998 42.667 43.5H8C3.85787 43.5 0.5 40.1421 0.5 36V28C0.5 23.8579 3.85786 20.5 8 20.5Z" stroke="black" stroke-opacity="0.12"/>
+<rect x="6" y="26" width="12" height="12" rx="6" fill="black" fill-opacity="0.12"/>
+<path d="M24 31C24 29.3431 25.3431 28 27 28H39.6667C41.3235 28 42.6667 29.3431 42.6667 31V33C42.6667 34.6569 41.3235 36 39.6667 36H27C25.3431 36 24 34.6569 24 33V31Z" fill="black" fill-opacity="0.12"/>
+<path d="M54.6667 28C54.6667 23.5817 58.2484 20 62.6667 20H97.3333C101.752 20 105.333 23.5817 105.333 28V36C105.333 40.4183 101.752 44 97.3334 44H62.6667C58.2484 44 54.6667 40.4183 54.6667 36V28Z" fill="white"/>
+<path d="M62.6667 20.5H97.3337C101.476 20.5002 104.834 23.858 104.834 28V36C104.834 40.142 101.476 43.4998 97.3337 43.5H62.6667C58.5246 43.5 55.1667 40.1421 55.1667 36V28C55.1667 23.8579 58.5246 20.5 62.6667 20.5Z" stroke="black" stroke-opacity="0.12"/>
+<rect x="60.6667" y="26" width="12" height="12" rx="6" fill="black" fill-opacity="0.12"/>
+<path d="M78.6667 31C78.6667 29.3431 80.0098 28 81.6667 28H94.3334C95.9902 28 97.3334 29.3431 97.3334 31V33C97.3334 34.6569 95.9902 36 94.3334 36H81.6667C80.0098 36 78.6667 34.6569 78.6667 33V31Z" fill="black" fill-opacity="0.12"/>
+<path d="M109.333 28C109.333 23.5817 112.915 20 117.333 20H152C156.418 20 160 23.5817 160 28V36C160 40.4183 156.418 44 152 44H117.333C112.915 44 109.333 40.4183 109.333 36V28Z" fill="white"/>
+<path d="M117.333 20.5H152C156.142 20.5002 159.5 23.858 159.5 28V36C159.5 40.142 156.142 43.4998 152 43.5H117.333C113.191 43.5 109.833 40.1421 109.833 36V28C109.833 23.8579 113.191 20.5 117.333 20.5Z" stroke="black" stroke-opacity="0.12"/>
+<rect x="115.333" y="26" width="12" height="12" rx="6" fill="black" fill-opacity="0.12"/>
+<path d="M133.333 31C133.333 29.3431 134.676 28 136.333 28H149C150.657 28 152 29.3431 152 31V33C152 34.6569 150.657 36 149 36H136.333C134.676 36 133.333 34.6569 133.333 33V31Z" fill="black" fill-opacity="0.12"/>
+<path d="M0 56C0 53.7909 1.79086 52 4 52H29C31.2091 52 33 53.7909 33 56C33 58.2091 31.2091 60 29 60H4C1.79086 60 0 58.2091 0 56Z" fill="black" fill-opacity="0.32"/>
+<path d="M0 72C0 67.5817 3.58172 64 8 64H29C33.4183 64 37 67.5817 37 72V96C37 100.418 33.4183 104 29 104H8C3.58172 104 0 100.418 0 96V72Z" fill="white"/>
+<path d="M8 64.5H29C33.1421 64.5 36.5 67.8579 36.5 72V96C36.5 100.142 33.1421 103.5 29 103.5H8C3.85786 103.5 0.5 100.142 0.5 96V72C0.5 67.8579 3.85786 64.5 8 64.5Z" stroke="black" stroke-opacity="0.12"/>
+<mask id="mask0_4744_39984" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="6" y="72" width="25" height="24">
+<path d="M18.5 74C16.6435 74 14.863 74.7375 13.5503 76.0503C12.2375 77.363 11.5 79.1435 11.5 81C11.5 83.38 12.69 85.47 14.5 86.74V89C14.5 89.2652 14.6054 89.5196 14.7929 89.7071C14.9804 89.8946 15.2348 90 15.5 90H21.5C21.7652 90 22.0196 89.8946 22.2071 89.7071C22.3946 89.5196 22.5 89.2652 22.5 89V86.74C24.31 85.47 25.5 83.38 25.5 81C25.5 79.1435 24.7625 77.363 23.4497 76.0503C22.137 74.7375 20.3565 74 18.5 74ZM15.5 93C15.5 93.2652 15.6054 93.5196 15.7929 93.7071C15.9804 93.8946 16.2348 94 16.5 94H20.5C20.7652 94 21.0196 93.8946 21.2071 93.7071C21.3946 93.5196 21.5 93.2652 21.5 93V92H15.5V93Z" fill="black"/>
+</mask>
+<g mask="url(#mask0_4744_39984)">
+<rect x="6.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M41 72C41 67.5817 44.5817 64 49 64H70C74.4183 64 78 67.5817 78 72V96C78 100.418 74.4183 104 70 104H49C44.5817 104 41 100.418 41 96V72Z" fill="white"/>
+<path d="M49 64.5H70C74.1421 64.5 77.5 67.8579 77.5 72V96C77.5 100.142 74.1421 103.5 70 103.5H49C44.8579 103.5 41.5 100.142 41.5 96V72C41.5 67.8579 44.8579 64.5 49 64.5Z" stroke="black" stroke-opacity="0.12"/>
+<mask id="mask1_4744_39984" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="47" y="72" width="25" height="24">
+<path d="M66.5 80C67.61 80 68.5 80.9 68.5 82V88.76C69.11 89.31 69.5 90.11 69.5 91C69.5 92.66 68.16 94 66.5 94C64.84 94 63.5 92.66 63.5 91C63.5 90.11 63.89 89.31 64.5 88.76V82C64.5 80.9 65.4 80 66.5 80ZM66.5 81C65.95 81 65.5 81.45 65.5 82V83H67.5V82C67.5 81.45 67.05 81 66.5 81ZM52.5 92V84H49.5L59.5 75L63.9 78.96C63.04 79.69 62.5 80.78 62.5 82V88C61.87 88.83 61.5 89.87 61.5 91L61.6 92H52.5Z" fill="black"/>
+</mask>
+<g mask="url(#mask1_4744_39984)">
+<rect x="47.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M82 72C82 67.5817 85.5817 64 90 64H111C115.418 64 119 67.5817 119 72V96C119 100.418 115.418 104 111 104H90C85.5817 104 82 100.418 82 96V72Z" fill="white"/>
+<path d="M90 64.5H111C115.142 64.5 118.5 67.8579 118.5 72V96C118.5 100.142 115.142 103.5 111 103.5H90C85.8579 103.5 82.5 100.142 82.5 96V72C82.5 67.8579 85.8579 64.5 90 64.5Z" stroke="black" stroke-opacity="0.12"/>
+<mask id="mask2_4744_39984" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="88" y="72" width="25" height="24">
+<path d="M100.5 84H107.5C106.97 88.11 104.22 91.78 100.5 92.92V84H93.5V78.3L100.5 75.19M100.5 73L91.5 77V83C91.5 88.55 95.34 93.73 100.5 95C105.66 93.73 109.5 88.55 109.5 83V77L100.5 73Z" fill="black"/>
+</mask>
+<g mask="url(#mask2_4744_39984)">
+<rect x="88.5" y="72" width="24" height="24" fill="#03A9F4"/>
+</g>
+<path d="M123 72C123 67.5817 126.582 64 131 64H152C156.418 64 160 67.5817 160 72V96C160 100.418 156.418 104 152 104H131C126.582 104 123 100.418 123 96V72Z" fill="white"/>
+<path d="M131 64.5H152C156.142 64.5 159.5 67.8579 159.5 72V96C159.5 100.142 156.142 103.5 152 103.5H131C126.858 103.5 123.5 100.142 123.5 96V72C123.5 67.8579 126.858 64.5 131 64.5Z" stroke="black" stroke-opacity="0.12"/>
+<mask id="mask3_4744_39984" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="129" y="72" width="25" height="24">
+<path d="M145.5 84C145.5 83.4696 145.711 82.9609 146.086 82.5858C146.461 82.2107 146.97 82 147.5 82C148.03 82 148.539 82.2107 148.914 82.5858C149.289 82.9609 149.5 83.4696 149.5 84C149.5 84.5304 149.289 85.0391 148.914 85.4142C148.539 85.7893 148.03 86 147.5 86C146.97 86 146.461 85.7893 146.086 85.4142C145.711 85.0391 145.5 84.5304 145.5 84ZM139.5 84C139.5 83.4696 139.711 82.9609 140.086 82.5858C140.461 82.2107 140.97 82 141.5 82C142.03 82 142.539 82.2107 142.914 82.5858C143.289 82.9609 143.5 83.4696 143.5 84C143.5 84.5304 143.289 85.0391 142.914 85.4142C142.539 85.7893 142.03 86 141.5 86C140.97 86 140.461 85.7893 140.086 85.4142C139.711 85.0391 139.5 84.5304 139.5 84ZM133.5 84C133.5 83.4696 133.711 82.9609 134.086 82.5858C134.461 82.2107 134.97 82 135.5 82C136.03 82 136.539 82.2107 136.914 82.5858C137.289 82.9609 137.5 83.4696 137.5 84C137.5 84.5304 137.289 85.0391 136.914 85.4142C136.539 85.7893 136.03 86 135.5 86C134.97 86 134.461 85.7893 134.086 85.4142C133.711 85.0391 133.5 84.5304 133.5 84Z" fill="black"/>
+</mask>
+<g mask="url(#mask3_4744_39984)">
+<rect x="129.5" y="72" width="24" height="24" fill="#18BCF2"/>
+</g>
+<path d="M0 116C0 113.791 1.79086 112 4 112H29C31.2091 112 33 113.791 33 116C33 118.209 31.2091 120 29 120H4C1.79086 120 0 118.209 0 116Z" fill="black" fill-opacity="0.32"/>
+<path d="M0 132C0 127.582 3.58172 124 8 124H70C74.4183 124 78 127.582 78 132V160H0V132Z" fill="url(#paint0_linear_4744_39984)"/>
+<path d="M8 124.5H70C74.1421 124.5 77.5 127.858 77.5 132V159.5H0.5V132C0.5 127.858 3.85786 124.5 8 124.5Z" stroke="url(#paint1_linear_4744_39984)" stroke-opacity="0.12"/>
+<path d="M82 132C82 127.582 85.5817 124 90 124H152C156.418 124 160 127.582 160 132V160H82V132Z" fill="url(#paint2_linear_4744_39984)"/>
+<path d="M90 124.5H152C156.142 124.5 159.5 127.858 159.5 132V159.5H82.5V132C82.5 127.858 85.8579 124.5 90 124.5Z" stroke="url(#paint3_linear_4744_39984)" stroke-opacity="0.12"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_4744_39984" x1="39" y1="124" x2="39" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4744_39984" x1="39" y1="124" x2="39" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-opacity="0.12"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_4744_39984" x1="121" y1="124" x2="121" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_4744_39984" x1="121" y1="124" x2="121" y2="160" gradientUnits="userSpaceOnUse">
+<stop offset="0.5" stop-opacity="0.12"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_4744_39984">
+<rect width="160" height="160" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20250827.0"
+version      = "20250901.0"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
--- a/src/components/ha-alert.ts
+++ b/src/components/ha-alert.ts
@@ -119,10 +119,11 @@ class HaAlert extends LitElement {
    .main-content {
      overflow-wrap: anywhere;
      word-break: break-word;
+      line-height: normal;
      margin-left: 8px;
      margin-right: 0;
      margin-inline-start: 8px;
-      margin-inline-end: 0;
+      margin-inline-end: 8px;
    }
    .title {
      margin-top: 2px;
--- a/src/components/ha-attributes.ts
+++ b/src/components/ha-attributes.ts
@@ -3,11 +3,15 @@ import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { computeAttributeNameDisplay } from "../common/entity/compute_attribute_display";
-import { STATE_ATTRIBUTES } from "../data/entity_attributes";
+import {
+  STATE_ATTRIBUTES,
+  STATE_ATTRIBUTES_DOMAIN_CLASS,
+} from "../data/entity_attributes";
 import { haStyle } from "../resources/styles";
 import type { HomeAssistant } from "../types";
 import "./ha-attribute-value";
 import "./ha-expansion-panel";
+import { computeStateDomain } from "../common/entity/compute_state_domain";

@customElement("ha-attributes")
 class HaAttributes extends LitElement {
@@ -22,7 +26,12 @@ class HaAttributes extends LitElement {
  private get _filteredAttributes() {
    return this._computeDisplayAttributes(
      STATE_ATTRIBUTES.concat(
-        this.extraFilters ? this.extraFilters.split(",") : []
+        this.extraFilters ? this.extraFilters.split(",") : [],
+        (this.stateObj &&
+          STATE_ATTRIBUTES_DOMAIN_CLASS[computeStateDomain(this.stateObj)]?.[
+            this.stateObj.attributes?.device_class
+          ]) ||
+          []
      )
    );
  }
--- a/src/components/ha-automation-row.ts
+++ b/src/components/ha-automation-row.ts
@@ -1,7 +1,7 @@
 import { mdiChevronUp } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import "./ha-icon-button";

@@ -16,12 +16,20 @@ export class HaAutomationRow extends LitElement {
  @property({ type: Boolean, reflect: true })
  public selected = false;

+  @property({ type: Boolean, reflect: true, attribute: "sort-selected" })
+  public sortSelected = false;
+
  @property({ type: Boolean, reflect: true })
  public disabled = false;

  @property({ type: Boolean, reflect: true, attribute: "building-block" })
  public buildingBlock = false;

+  @property({ type: Boolean, reflect: true }) public highlight?: boolean;
+
+  @query(".row")
+  private _rowElement?: HTMLDivElement;
+
  protected render(): TemplateResult {
    return html`
      <div
@@ -66,15 +74,62 @@ export class HaAutomationRow extends LitElement {
    if (ev.defaultPrevented) {
      return;
    }
-    if (ev.key !== "Enter" && ev.key !== " ") {
+
+    if (
+      ev.key !== "Enter" &&
+      ev.key !== " " &&
+      !(
+        (this.sortSelected || ev.altKey) &&
+        (ev.key === "ArrowUp" || ev.key === "ArrowDown")
+      ) &&
+      !(
+        (ev.ctrlKey || ev.metaKey) &&
+        (ev.key === "c" || ev.key === "x" || ev.key === "Delete")
+      )
+    ) {
      return;
    }
    ev.preventDefault();
    ev.stopPropagation();

+    if (ev.key === "ArrowUp" || ev.key === "ArrowDown") {
+      if (ev.key === "ArrowUp") {
+        fireEvent(this, "move-up");
+        return;
+      }
+      fireEvent(this, "move-down");
+      return;
+    }
+    if (this.sortSelected && (ev.key === "Enter" || ev.key === " ")) {
+      fireEvent(this, "stop-sort-selection");
+      return;
+    }
+
+    if (ev.ctrlKey || ev.metaKey) {
+      if (ev.key === "c") {
+        fireEvent(this, "copy-row");
+        return;
+      }
+      if (ev.key === "x") {
+        fireEvent(this, "cut-row");
+        return;
+      }
+
+      if (ev.key === "Delete") {
+        fireEvent(this, "delete-row");
+        return;
+      }
+    }
+
    this.click();
  }

+  public focus() {
+    requestAnimationFrame(() => {
+      this._rowElement?.focus();
+    });
+  }
+
  static styles = css`
    :host {
      display: block;
@@ -134,6 +189,22 @@ export class HaAutomationRow extends LitElement {
      overflow-wrap: anywhere;
      margin: 0 12px;
    }
+    :host([sort-selected]) .row {
+      outline: solid;
+      outline-color: rgba(var(--rgb-accent-color), 0.6);
+      outline-offset: -2px;
+      outline-width: 2px;
+      background-color: rgba(var(--rgb-accent-color), 0.08);
+    }
+    .row:hover {
+      background-color: rgba(var(--rgb-primary-text-color), 0.04);
+    }
+    :host([highlight]) .row {
+      background-color: rgba(var(--rgb-primary-color), 0.08);
+    }
+    :host([highlight]) .row:hover {
+      background-color: rgba(var(--rgb-primary-color), 0.16);
+    }
  `;
 }

@@ -144,5 +215,9 @@ declare global {

  interface HASSDomEvents {
    "toggle-collapsed": undefined;
+    "stop-sort-selection": undefined;
+    "copy-row": undefined;
+    "cut-row": undefined;
+    "delete-row": undefined;
  }
 }
--- a/src/components/ha-bottom-sheet.ts
+++ b/src/components/ha-bottom-sheet.ts
@@ -197,6 +197,7 @@ export class HaBottomSheet extends LitElement {
      justify-content: center;
      align-items: center;
      z-index: 7;
+      padding-bottom: 76px;
    }
    .handle-wrapper .handle::after {
      content: "";
--- a/src/components/ha-items-display-editor.ts
+++ b/src/components/ha-items-display-editor.ts
@@ -393,10 +393,13 @@ export class HaItemDisplayEditor extends LitElement {
      --md-list-item-one-line-container-height: 48px;
    }
    ha-md-list-item.drag-selected {
-      box-shadow:
-        0px 0px 8px 4px rgba(var(--rgb-accent-color), 0.8),
-        inset 0px 2px 8px 4px rgba(var(--rgb-accent-color), 0.4);
+      --md-focus-ring-color: rgba(var(--rgb-accent-color), 0.6);
      border-radius: 8px;
+      outline: solid;
+      outline-color: rgba(var(--rgb-accent-color), 0.6);
+      outline-offset: -2px;
+      outline-width: 2px;
+      background-color: rgba(var(--rgb-accent-color), 0.08);
    }
    ha-md-list-item ha-icon-button {
      margin-left: -12px;
--- a/src/components/ha-md-button-menu.ts
+++ b/src/components/ha-md-button-menu.ts
@@ -16,9 +16,23 @@ export class HaMdButtonMenu extends LitElement {

  @property() public positioning?: "fixed" | "absolute" | "popover";

+  @property({ attribute: "anchor-corner" }) public anchorCorner:
+    | "start-start"
+    | "start-end"
+    | "end-start"
+    | "end-end" = "end-start";
+
+  @property({ attribute: "menu-corner" }) public menuCorner:
+    | "start-start"
+    | "start-end"
+    | "end-start"
+    | "end-end" = "start-start";
+
  @property({ type: Boolean, attribute: "has-overflow" }) public hasOverflow =
    false;

+  @property({ type: Boolean }) public quick = false;
+
  @query("ha-md-menu", true) private _menu!: HaMdMenu;

  public get items() {
@@ -39,8 +53,11 @@ export class HaMdButtonMenu extends LitElement {
        <slot name="trigger" @slotchange=${this._setTriggerAria}></slot>
      </div>
      <ha-md-menu
+        .quick=${this.quick}
        .positioning=${this.positioning}
        .hasOverflow=${this.hasOverflow}
+        .anchorCorner=${this.anchorCorner}
+        .menuCorner=${this.menuCorner}
        @opening=${this._handleOpening}
        @closing=${this._handleClosing}
      >
--- a/src/components/ha-network.ts
+++ b/src/components/ha-network.ts
@@ -1,4 +1,4 @@
-import { mdiStar } from "@mdi/js";
+import { mdiInformationOutline, mdiStar } from "@mdi/js";
 import type { CSSResultGroup, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -71,6 +71,17 @@ export class HaNetwork extends LitElement {
        <span slot="description" data-for="auto_configure">
          ${this.hass.localize("ui.panel.config.network.adapter.detected")}:
          ${format_auto_detected_interfaces(this.networkConfig.adapters)}
+          ${!configured_adapters.length
+            ? html`<div class="info-text">
+                <ha-svg-icon
+                  .path=${mdiInformationOutline}
+                  class="info-icon"
+                ></ha-svg-icon>
+                ${this.hass.localize(
+                  "ui.panel.config.network.adapter.auto_configure_manual_hint"
+                )}
+              </div>`
+            : nothing}
        </span>
      </ha-settings-row>
      ${configured_adapters.length || this._expanded
@@ -171,6 +182,21 @@ export class HaNetwork extends LitElement {
        span[slot="description"] {
          cursor: pointer;
        }
+
+        .info-text {
+          display: flex;
+          align-items: center;
+          margin-top: 8px;
+          color: var(--secondary-text-color);
+        }
+
+        .info-icon {
+          width: 18px;
+          height: 18px;
+          color: var(--info-color, var(--primary-color));
+          margin-right: 8px;
+          flex-shrink: 0;
+        }
      `,
    ];
  }
--- a/src/components/ha-selector/ha-selector-media.ts
+++ b/src/components/ha-selector/ha-selector-media.ts
@@ -53,9 +53,15 @@ export class HaMediaSelector extends LitElement {

  private _contextEntities: string[] | undefined;

+  private get _hasAccept(): boolean {
+    return !!this.selector?.media?.accept?.length;
+  }
+
  willUpdate(changedProps: PropertyValues<this>) {
    if (changedProps.has("context")) {
-      this._contextEntities = ensureArray(this.context?.filter_entity);
+      if (!this._hasAccept) {
+        this._contextEntities = ensureArray(this.context?.filter_entity);
+      }
    }

    if (changedProps.has("value")) {
@@ -99,10 +105,8 @@ export class HaMediaSelector extends LitElement {
      (stateObj &&
        supportsFeature(stateObj, MediaPlayerEntityFeature.BROWSE_MEDIA));

-    const hasAccept = this.selector?.media?.accept?.length;
-
    return html`
-      ${hasAccept ||
+      ${this._hasAccept ||
      (this._contextEntities && this._contextEntities.length <= 1)
        ? nothing
        : html`
@@ -148,7 +152,7 @@ export class HaMediaSelector extends LitElement {
                : this.value.metadata?.title || this.value.media_content_id}
              @click=${this._pickMedia}
              @keydown=${this._handleKeyDown}
-              class=${this.disabled || (!entityId && !hasAccept)
+              class=${this.disabled || (!entityId && !this._hasAccept)
                ? "disabled"
                : ""}
            >
@@ -215,7 +219,7 @@ export class HaMediaSelector extends LitElement {

  private _entityChanged(ev: CustomEvent) {
    ev.stopPropagation();
-    if (this.context?.filter_entity) {
+    if (!this._hasAccept && this.context?.filter_entity) {
      fireEvent(this, "value-changed", {
        value: {
          media_content_id: "",
@@ -257,7 +261,7 @@ export class HaMediaSelector extends LitElement {
                media_content_type: id.media_content_type,
                media_content_id: id.media_content_id,
              })),
-              ...(this.context?.filter_entity
+              ...(!this._hasAccept && this.context?.filter_entity
                ? { browse_entity_id: this._getActiveEntityId() }
                : {}),
            },
--- a/src/components/ha-sortable.ts
+++ b/src/components/ha-sortable.ts
@@ -15,6 +15,7 @@ declare global {
    "item-added": {
      index: number;
      data: any;
+      item: any;
    };
    "item-removed": {
      index: number;
@@ -180,6 +181,7 @@ export class HaSortable extends LitElement {
    fireEvent(this, "item-added", {
      index: evt.newIndex,
      data: evt.item.sortableData,
+      item: evt.item,
    });
  };

--- a/src/data/automation.ts
+++ b/src/data/automation.ts
@@ -556,18 +556,18 @@ export interface AutomationClipboard {
 }

 export interface BaseSidebarConfig {
-  toggleYamlMode: () => boolean;
  delete: () => void;
+  close: (focus?: boolean) => void;
 }

 export interface TriggerSidebarConfig extends BaseSidebarConfig {
  save: (value: Trigger) => void;
-  close: () => void;
  rename: () => void;
  disable: () => void;
  duplicate: () => void;
  cut: () => void;
  copy: () => void;
+  toggleYamlMode: () => void;
  config: Trigger;
  yamlMode: boolean;
  uiSupported: boolean;
@@ -575,13 +575,13 @@ export interface TriggerSidebarConfig extends BaseSidebarConfig {

 export interface ConditionSidebarConfig extends BaseSidebarConfig {
  save: (value: Condition) => void;
-  close: () => void;
  rename: () => void;
  disable: () => void;
  test: () => void;
  duplicate: () => void;
  cut: () => void;
  copy: () => void;
+  toggleYamlMode: () => void;
  config: Condition;
  yamlMode: boolean;
  uiSupported: boolean;
@@ -589,13 +589,13 @@ export interface ConditionSidebarConfig extends BaseSidebarConfig {

 export interface ActionSidebarConfig extends BaseSidebarConfig {
  save: (value: Action) => void;
-  close: () => void;
  rename: () => void;
  disable: () => void;
  duplicate: () => void;
  cut: () => void;
  copy: () => void;
  run: () => void;
+  toggleYamlMode: () => void;
  config: {
    action: Action;
  };
@@ -604,7 +604,6 @@ export interface ActionSidebarConfig extends BaseSidebarConfig {
 }

 export interface OptionSidebarConfig extends BaseSidebarConfig {
-  close: () => void;
  rename: () => void;
  duplicate: () => void;
  defaultOption?: boolean;
@@ -612,13 +611,13 @@ export interface OptionSidebarConfig extends BaseSidebarConfig {

 export interface ScriptFieldSidebarConfig extends BaseSidebarConfig {
  save: (value: Field) => void;
-  close: () => void;
  config: {
    field: Field;
    selector: boolean;
    key: string;
    excludeKeys: string[];
  };
+  toggleYamlMode: () => void;
  yamlMode: boolean;
 }

--- a/src/data/entity_attributes.ts
+++ b/src/data/entity_attributes.ts
@@ -1,6 +1,7 @@
 import { formatDurationDigital } from "../common/datetime/format_duration";
 import type { FrontendLocaleData } from "./translation";

+// These attributes are hidden from the more-info window for all entities.
 export const STATE_ATTRIBUTES = [
  "entity_id",
  "assumed_state",
@@ -26,6 +27,14 @@ export const STATE_ATTRIBUTES = [
  "available_tones",
 ];

+// These attributes are hidden from the more-info window for entities of the
+// matching domain and device_class.
+export const STATE_ATTRIBUTES_DOMAIN_CLASS = {
+  sensor: {
+    enum: ["options"],
+  },
+};
+
 export const TEMPERATURE_ATTRIBUTES = new Set([
  "temperature",
  "current_temperature",
--- a/src/data/hassio/host.ts
+++ b/src/data/hassio/host.ts
@@ -195,6 +195,7 @@ export const fetchHostDisksUsage = async (hass: HomeAssistant) => {
      type: "supervisor/api",
      endpoint: "/host/disks/default/usage",
      method: "get",
+      timeout: 3600, // seconds. This can take a while
    });
  }

--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@@ -3,11 +3,11 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../../common/dom/fire_event";
+import "../../components/ha-button";
+import "../../components/ha-dialog-header";
 import "../../components/ha-md-dialog";
 import type { HaMdDialog } from "../../components/ha-md-dialog";
-import "../../components/ha-dialog-header";
 import "../../components/ha-svg-icon";
-import "../../components/ha-button";
 import "../../components/ha-textfield";
 import type { HaTextField } from "../../components/ha-textfield";
 import type { HomeAssistant } from "../../types";
@@ -52,7 +52,7 @@ class DialogBox extends LitElement {
      return nothing;
    }

-    const confirmPrompt = this._params.confirmation || this._params.prompt;
+    const confirmPrompt = this._params.confirmation || !!this._params.prompt;

    const dialogTitle =
      this._params.title ||
@@ -62,7 +62,7 @@ class DialogBox extends LitElement {
    return html`
      <ha-md-dialog
        open
-        .disableCancelAction=${confirmPrompt || false}
+        .disableCancelAction=${confirmPrompt}
        @closed=${this._dialogClosed}
        type="alert"
        aria-labelledby="dialog-box-title"
@@ -100,23 +100,22 @@ class DialogBox extends LitElement {
            : ""}
        </div>
        <div slot="actions">
-          ${confirmPrompt &&
-          html`
-            <ha-button
-              @click=${this._dismiss}
-              ?dialogInitialFocus=${!this._params.prompt &&
-              this._params.destructive}
-              appearance="plain"
-            >
-              ${this._params.dismissText
-                ? this._params.dismissText
-                : this.hass.localize("ui.common.cancel")}
-            </ha-button>
-          `}
+          ${confirmPrompt
+            ? html`
+                <ha-button
+                  @click=${this._dismiss}
+                  ?autofocus=${!this._params.prompt && this._params.destructive}
+                  appearance="plain"
+                >
+                  ${this._params.dismissText
+                    ? this._params.dismissText
+                    : this.hass.localize("ui.common.cancel")}
+                </ha-button>
+              `
+            : nothing}
          <ha-button
            @click=${this._confirm}
-            ?dialogInitialFocus=${!this._params.prompt &&
-            !this._params.destructive}
+            ?autofocus=${!this._params.prompt && !this._params.destructive}
            variant=${this._params.destructive ? "danger" : "brand"}
          >
            ${this._params.confirmText
--- a/src/mixins/keyboard-shortcut-mixin.ts
+++ b/src/mixins/keyboard-shortcut-mixin.ts
@@ -14,20 +14,46 @@ export const KeyboardShortcutMixin = <T extends Constructor<LitElement>>(
      if ((event.ctrlKey || event.metaKey) && event.key in supportedShortcuts) {
        event.preventDefault();
        supportedShortcuts[event.key]();
+        return;
+      }
+
+      const supportedSingleKeyShortcuts = this.supportedSingleKeyShortcuts();
+      if (event.key in supportedSingleKeyShortcuts) {
+        event.preventDefault();
+        supportedSingleKeyShortcuts[event.key]();
      }
    };

+    private _listenersAdded = false;
+
    public connectedCallback() {
      super.connectedCallback();
-      window.addEventListener("keydown", this._keydownEvent);
+      this.addKeyboardShortcuts();
    }

    public disconnectedCallback() {
-      window.removeEventListener("keydown", this._keydownEvent);
+      this.removeKeyboardShortcuts();
      super.disconnectedCallback();
    }

+    public addKeyboardShortcuts() {
+      if (this._listenersAdded) {
+        return;
+      }
+      this._listenersAdded = true;
+      window.addEventListener("keydown", this._keydownEvent);
+    }
+
+    public removeKeyboardShortcuts() {
+      this._listenersAdded = false;
+      window.removeEventListener("keydown", this._keydownEvent);
+    }
+
    protected supportedShortcuts(): SupportedShortcuts {
      return {};
    }
+
+    protected supportedSingleKeyShortcuts(): SupportedShortcuts {
+      return {};
+    }
  };
--- a/src/panels/config/automation/action/ha-automation-action-editor.ts
+++ b/src/panels/config/automation/action/ha-automation-action-editor.ts
@@ -53,6 +53,7 @@ export default class HaAutomationActionEditor extends LitElement {
            this.disabled || (this.action.enabled === false && !this.yamlMode),
          yaml: yamlMode,
          indent: this.indent,
+          card: !this.inSidebar,
        })}
      >
        ${yamlMode
@@ -96,7 +97,7 @@ export default class HaAutomationActionEditor extends LitElement {
    if (!ev.detail.isValid) {
      return;
    }
-    fireEvent(this, "value-changed", {
+    fireEvent(this, "yaml-changed", {
      value: migrateAutomationAction(ev.detail.value),
    });
  }
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -5,12 +5,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -26,6 +26,7 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-automation-row";
+import type { HaAutomationRow } from "../../../../components/ha-automation-row";
 import "../../../../components/ha-card";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
@@ -88,6 +89,7 @@ import "./types/ha-automation-action-set_conversation_response";
 import "./types/ha-automation-action-stop";
 import "./types/ha-automation-action-wait_for_trigger";
 import "./types/ha-automation-action-wait_template";
+import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export const getAutomationActionType = memoizeOne(
  (action: Action | undefined) => {
@@ -150,9 +152,14 @@ export default class HaAutomationActionRow extends LitElement {

  @property({ type: Boolean }) public last?: boolean;

+  @property({ type: Boolean }) public highlight?: boolean;
+
  @property({ type: Boolean, attribute: "sidebar" })
  public optionsInSidebar = false;

+  @property({ type: Boolean, attribute: "sort-selected" })
+  public sortSelected = false;
+
  @storage({
    key: "automationClipboard",
    state: false,
@@ -186,6 +193,13 @@ export default class HaAutomationActionRow extends LitElement {
  @query("ha-automation-action-editor")
  private _actionEditor?: HaAutomationActionEditor;

+  @query("ha-automation-row")
+  private _automationRowElement?: HaAutomationRow;
+
+  get selected() {
+    return this._selected;
+  }
+
  protected firstUpdated(changedProperties: PropertyValues): void {
    super.firstUpdated(changedProperties);

@@ -254,138 +268,136 @@ export default class HaAutomationActionRow extends LitElement {
            <ha-svg-icon .path=${mdiAlertCircleCheck}></ha-svg-icon>
          </ha-tooltip>`
        : nothing}
+      ${!this.optionsInSidebar
+        ? html`<ha-md-button-menu
+            quick
+            slot="icons"
+            @click=${preventDefaultStopPropagation}
+            @keydown=${stopPropagation}
+            @closed=${stopPropagation}
+            positioning="fixed"
+            anchor-corner="end-end"
+            menu-corner="start-end"
+          >
+            <ha-icon-button
+              slot="trigger"
+              .label=${this.hass.localize("ui.common.menu")}
+              .path=${mdiDotsVertical}
+            ></ha-icon-button>

-      <ha-md-button-menu
-        slot="icons"
-        @click=${preventDefaultStopPropagation}
-        @keydown=${stopPropagation}
-        @closed=${stopPropagation}
-        positioning="fixed"
-      >
-        <ha-icon-button
-          slot="trigger"
-          .label=${this.hass.localize("ui.common.menu")}
-          .path=${mdiDotsVertical}
-        ></ha-icon-button>
+            <ha-md-menu-item .clickAction=${this._runAction}>
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.run"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiPlay}></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._renameAction}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.rename"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
+            <ha-md-menu-item
+              .clickAction=${this._duplicateAction}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.duplicate"
+              )}
+              <ha-svg-icon
+                slot="start"
+                .path=${mdiPlusCircleMultipleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>

-        ${!this.optionsInSidebar
-          ? html`<ha-md-menu-item .clickAction=${this._runAction}>
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.run"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiPlay}></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-menu-item
-                .clickAction=${this._renameAction}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.rename"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
-              <ha-md-menu-item
-                .clickAction=${this._duplicateAction}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.duplicate"
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiContentDuplicate}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._copyAction}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.copy"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._copyAction}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.copy"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._cutAction}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.cut"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._cutAction}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.cut"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-              </ha-md-menu-item>`
-          : nothing}
+            <ha-md-menu-item
+              .clickAction=${this._moveUp}
+              .disabled=${this.disabled || !!this.first}
+            >
+              ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
+              <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
+            ></ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveUp}
-          .disabled=${this.disabled || !!this.first}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
-          <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._moveDown}
+              .disabled=${this.disabled || !!this.last}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.move_down"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
+            ></ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveDown}
-          .disabled=${this.disabled || !!this.last}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_down")}
-          <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._toggleYamlMode}
+              .disabled=${!this._uiModeAvailable || !!this._warnings}
+            >
+              ${this.hass.localize(
+                `ui.panel.config.automation.editor.edit_${!this._yamlMode ? "yaml" : "ui"}`
+              )}
+              <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+            </ha-md-menu-item>

-        ${!this.optionsInSidebar
-          ? html`<ha-md-menu-item
-                .clickAction=${this._toggleYamlMode}
-                .disabled=${!this._uiModeAvailable || !!this._warnings}
-              >
-                ${this.hass.localize(
-                  `ui.panel.config.automation.editor.edit_${!this._yamlMode ? "yaml" : "ui"}`
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiPlaylistEdit}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>

-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
-
-              <ha-md-menu-item
-                .clickAction=${this._onDisable}
-                .disabled=${this.disabled}
-              >
-                ${this.action.enabled === false
-                  ? this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.enable"
-                    )
-                  : this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.disable"
-                    )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${this.action.enabled === false
-                    ? mdiPlayCircleOutline
-                    : mdiStopCircleOutline}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-menu-item
+            <ha-md-menu-item
+              .clickAction=${this._onDisable}
+              .disabled=${this.disabled}
+            >
+              ${this.action.enabled === false
+                ? this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.enable"
+                  )
+                : this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.disable"
+                  )}
+              <ha-svg-icon
+                slot="start"
+                .path=${this.action.enabled === false
+                  ? mdiPlayCircleOutline
+                  : mdiStopCircleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-menu-item
+              class="warning"
+              .clickAction=${this._onDelete}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.delete"
+              )}
+              <ha-svg-icon
                class="warning"
-                .clickAction=${this._onDelete}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.delete"
-                )}
-                <ha-svg-icon
-                  class="warning"
-                  slot="start"
-                  .path=${mdiDelete}
-                ></ha-svg-icon>
-              </ha-md-menu-item>`
-          : nothing}
-      </ha-md-button-menu>
-
+                slot="start"
+                .path=${mdiDelete}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+          </ha-md-button-menu>`
+        : nothing}
      ${!this.optionsInSidebar
        ? html`${this._warnings
              ? html`<ha-automation-editor-warning
@@ -431,7 +443,6 @@ export default class HaAutomationActionRow extends LitElement {
        ${this.optionsInSidebar
          ? html`<ha-automation-row
              .disabled=${this.action.enabled === false}
-              @click=${this._toggleSidebar}
              .leftChevron=${[
                ...ACTION_BUILDING_BLOCKS,
                ...ACTION_COMBINED_BLOCKS,
@@ -442,11 +453,17 @@ export default class HaAutomationActionRow extends LitElement {
                ))}
              .collapsed=${this._collapsed}
              .selected=${this._selected}
-              @toggle-collapsed=${this._toggleCollapse}
+              .highlight=${this.highlight}
              .buildingBlock=${[
                ...ACTION_BUILDING_BLOCKS,
                ...ACTION_COMBINED_BLOCKS,
              ].includes(blockType!)}
+              .sortSelected=${this.sortSelected}
+              @click=${this._toggleSidebar}
+              @toggle-collapsed=${this._toggleCollapse}
+              @copy-row=${this._copyAction}
+              @cut-row=${this._cutAction}
+              @delete-row=${this._onDelete}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -491,6 +508,7 @@ export default class HaAutomationActionRow extends LitElement {
      ...this._clipboard,
      action: deepClone(this.action),
    };
+    copyToClipboard(JSON.stringify(this.action));
  }

  private _onDisable = () => {
@@ -505,6 +523,15 @@ export default class HaAutomationActionRow extends LitElement {
  };

  private _runAction = async () => {
+    requestAnimationFrame(() => {
+      // @ts-ignore is supported in all browsers except firefox
+      if (this.scrollIntoViewIfNeeded) {
+        // @ts-ignore is supported in all browsers except firefox
+        this.scrollIntoViewIfNeeded();
+        return;
+      }
+      this.scrollIntoView();
+    });
    const validated = await validateConfig(this.hass, {
      actions: this.action,
    });
@@ -614,6 +641,12 @@ export default class HaAutomationActionRow extends LitElement {

  private _copyAction = () => {
    this._setClipboard();
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.actions.copied_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _cutAction = () => {
@@ -622,6 +655,12 @@ export default class HaAutomationActionRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.actions.cut_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _moveUp = () => {
@@ -670,16 +709,19 @@ export default class HaAutomationActionRow extends LitElement {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
      },
-      close: () => {
+      close: (focus?: boolean) => {
        this._selected = false;
        fireEvent(this, "close-sidebar");
+        if (focus) {
+          this.focus();
+        }
      },
      rename: () => {
        this._renameAction();
      },
      toggleYamlMode: () => {
        this._toggleYamlMode();
-        return this._yamlMode;
+        this.openSidebar();
      },
      disable: this._onDisable,
      delete: this._onDelete,
@@ -697,9 +739,11 @@ export default class HaAutomationActionRow extends LitElement {
    this._collapsed = false;

    if (this.narrow) {
-      this.scrollIntoView({
-        block: "start",
-        behavior: "smooth",
+      requestAnimationFrame(() => {
+        this.scrollIntoView({
+          block: "start",
+          behavior: "smooth",
+        });
      });
    }
  }
@@ -747,6 +791,10 @@ export default class HaAutomationActionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public focus() {
+    this._automationRowElement?.focus();
+  }
+
  static styles = rowStyles;
 }

--- a/src/panels/config/automation/action/ha-automation-action.ts
+++ b/src/panels/config/automation/action/ha-automation-action.ts
@@ -1,12 +1,11 @@
 import { mdiDrag, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
-import { LitElement, css, html, nothing } from "lit";
+import { LitElement, html, nothing } from "lit";
 import { customElement, property, queryAll, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { listenMediaQuery } from "../../../../common/dom/media_query";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-sortable";
@@ -45,7 +44,7 @@ export default class HaAutomationAction extends LitElement {
  @property({ type: Boolean, attribute: "sidebar" }) public optionsInSidebar =
    false;

-  @state() private _showReorder = false;
+  @state() private _rowSortSelected?: number;

  @state()
  @storage({
@@ -61,36 +60,23 @@ export default class HaAutomationAction extends LitElement {

  private _focusLastActionOnChange = false;

+  private _focusActionIndexOnChange?: number;
+
  private _actionKeys = new WeakMap<Action, string>();

-  private _unsubMql?: () => void;
-
-  public connectedCallback() {
-    super.connectedCallback();
-    this._unsubMql = listenMediaQuery("(min-width: 600px)", (matches) => {
-      this._showReorder = matches;
-    });
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubMql?.();
-    this._unsubMql = undefined;
-  }
-
  protected render() {
    return html`
      <ha-sortable
        handle-selector=".handle"
        draggable-selector="ha-automation-action-row"
-        .disabled=${!this._showReorder || this.disabled}
+        .disabled=${this.disabled}
        group="actions"
        invert-swap
        @item-moved=${this._actionMoved}
        @item-added=${this._actionAdded}
        @item-removed=${this._actionRemoved}
      >
-        <div class="rows">
+        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
            this.actions,
            (action) => this._getKey(action),
@@ -109,12 +95,22 @@ export default class HaAutomationAction extends LitElement {
                @move-up=${this._moveUp}
                @value-changed=${this._actionChanged}
                .hass=${this.hass}
-                ?highlight=${this.highlightedActions?.includes(action)}
+                .highlight=${this.highlightedActions?.includes(action)}
                .optionsInSidebar=${this.optionsInSidebar}
+                .sortSelected=${this._rowSortSelected === idx}
+                @stop-sort-selection=${this._stopSortSelection}
              >
-                ${this._showReorder && !this.disabled
+                ${!this.disabled
                  ? html`
-                      <div class="handle" slot="icons">
+                      <div
+                        tabindex="0"
+                        class="handle ${this._rowSortSelected === idx
+                          ? "active"
+                          : ""}"
+                        slot="icons"
+                        @keydown=${this._handleDragKeydown}
+                        .index=${idx}
+                      >
                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
                      </div>
                    `
@@ -154,19 +150,27 @@ export default class HaAutomationAction extends LitElement {
  protected updated(changedProps: PropertyValues) {
    super.updated(changedProps);

-    if (changedProps.has("actions") && this._focusLastActionOnChange) {
-      this._focusLastActionOnChange = false;
+    if (
+      changedProps.has("actions") &&
+      (this._focusLastActionOnChange ||
+        this._focusActionIndexOnChange !== undefined)
+    ) {
+      const mode = this._focusLastActionOnChange ? "new" : "moved";

      const row = this.shadowRoot!.querySelector<HaAutomationActionRow>(
-        "ha-automation-action-row:last-of-type"
+        `ha-automation-action-row:${mode === "new" ? "last-of-type" : `nth-of-type(${this._focusActionIndexOnChange! + 1})`}`
      )!;
+
+      this._focusLastActionOnChange = false;
+      this._focusActionIndexOnChange = undefined;
+
      row.updateComplete.then(() => {
        // on new condition open the settings in the sidebar, except for building blocks
        const type = getAutomationActionType(row.action);
        if (
          type &&
          this.optionsInSidebar &&
-          !ACTION_BUILDING_BLOCKS.includes(type)
+          (!ACTION_BUILDING_BLOCKS.includes(type) || mode === "moved")
        ) {
          row.openSidebar();
          if (this.narrow) {
@@ -176,8 +180,14 @@ export default class HaAutomationAction extends LitElement {
            });
          }
        }
-        row.expand();
-        row.focus();
+
+        if (mode === "new") {
+          row.expand();
+        }
+
+        if (!this.optionsInSidebar) {
+          row.focus();
+        }
      });
    }
  }
@@ -246,18 +256,30 @@ export default class HaAutomationAction extends LitElement {
    return this._actionKeys.get(action)!;
  }

-  private _moveUp(ev) {
+  private async _moveUp(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index - 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationActionRow).first) {
+      const newIndex = index - 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

-  private _moveDown(ev) {
+  private async _moveDown(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index + 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationActionRow).last) {
+      const newIndex = index + 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _move(oldIndex: number, newIndex: number) {
@@ -277,6 +299,9 @@ export default class HaAutomationAction extends LitElement {
  private async _actionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
+    const item = ev.detail.item as HaAutomationActionRow;
+    const selected = item.selected;
+
    let actions = [
      ...this.actions.slice(0, index),
      data,
@@ -284,6 +309,9 @@ export default class HaAutomationAction extends LitElement {
    ];
    // Add action locally to avoid UI jump
    this.actions = actions;
+    if (selected) {
+      this._focusActionIndexOnChange = actions.length === 1 ? 0 : index;
+    }
    await nextRender();
    if (this.actions !== actions) {
      // Ensure action is added even after update
@@ -292,6 +320,9 @@ export default class HaAutomationAction extends LitElement {
        data,
        ...this.actions.slice(index),
      ];
+      if (selected) {
+        this._focusActionIndexOnChange = actions.length === 1 ? 0 : index;
+      }
    }
    fireEvent(this, "value-changed", { value: actions });
  }
@@ -335,14 +366,21 @@ export default class HaAutomationAction extends LitElement {
    });
  }

-  static styles = [
-    automationRowsStyles,
-    css`
-      :host([root]) .rows {
-        padding-right: 8px;
-      }
-    `,
-  ];
+  private _handleDragKeydown(ev: KeyboardEvent) {
+    if (ev.key === "Enter" || ev.key === " ") {
+      ev.stopPropagation();
+      this._rowSortSelected =
+        this._rowSortSelected === undefined
+          ? (ev.target as any).index
+          : undefined;
+    }
+  }
+
+  private _stopSortSelection() {
+    this._rowSortSelected = undefined;
+  }
+
+  static styles = automationRowsStyles;
 }

 declare global {
--- a/src/panels/config/automation/add-automation-element-dialog.ts
+++ b/src/panels/config/automation/add-automation-element-dialog.ts
@@ -1,4 +1,9 @@
-import { mdiClose, mdiContentPaste, mdiPlus } from "@mdi/js";
+import {
+  mdiAppleKeyboardCommand,
+  mdiClose,
+  mdiContentPaste,
+  mdiPlus,
+} from "@mdi/js";
 import Fuse from "fuse.js";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
@@ -41,11 +46,14 @@ import {
 } from "../../../data/integration";
 import { TRIGGER_GROUPS, TRIGGER_ICONS } from "../../../data/trigger";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
+import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
+import { HaFuse } from "../../../resources/fuse";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
+import { isMac } from "../../../util/is_mac";
+import { showToast } from "../../../util/toast";
 import type { AddAutomationElementDialogParams } from "./show-add-automation-element-dialog";
 import { PASTE_VALUE } from "./show-add-automation-element-dialog";
-import { HaFuse } from "../../../resources/fuse";

 const TYPES = {
  trigger: { groups: TRIGGER_GROUPS, icons: TRIGGER_ICONS },
@@ -85,7 +93,10 @@ const ENTITY_DOMAINS_OTHER = new Set([
 const ENTITY_DOMAINS_MAIN = new Set(["notify"]);

@customElement("add-automation-element-dialog")
-class DialogAddAutomationElement extends LitElement implements HassDialog {
+class DialogAddAutomationElement
+  extends KeyboardShortcutMixin(LitElement)
+  implements HassDialog
+{
  @property({ attribute: false }) public hass!: HomeAssistant;

  @state() private _params?: AddAutomationElementDialogParams;
@@ -108,9 +119,14 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {

  @state() private _height?: number;

+  @state() private _narrow = false;
+
  public showDialog(params): void {
    this._params = params;
    this._group = params.group;
+
+    this.addKeyboardShortcuts();
+
    if (this._params?.type === "action") {
      this.hass.loadBackendTranslation("services");
      this._fetchManifests();
@@ -120,9 +136,12 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
    this._fullScreen = matchMedia(
      "all and (max-width: 450px), all and (max-height: 500px)"
    ).matches;
+
+    this._narrow = matchMedia("(max-width: 870px)").matches;
  }

  public closeDialog() {
+    this.removeKeyboardShortcuts();
    if (this._params) {
      fireEvent(this, "dialog-closed", { dialog: this.localName });
    }
@@ -555,15 +574,37 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
                  .value=${PASTE_VALUE}
                  @click=${this._selected}
                >
-                  ${this.hass.localize(
-                    `ui.panel.config.automation.editor.${this._params.type}s.paste`
-                  )}
-                  <span slot="supporting-text"
-                    >${this.hass.localize(
-                      // @ts-ignore
-                      `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
-                    )}</span
-                  >
+                  <div class="shortcut-label">
+                    <div class="label">
+                      <div>
+                        ${this.hass.localize(
+                          `ui.panel.config.automation.editor.${this._params.type}s.paste`
+                        )}
+                      </div>
+                      <div class="supporting-text">
+                        ${this.hass.localize(
+                          // @ts-ignore
+                          `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
+                        )}
+                      </div>
+                    </div>
+                    ${!this._narrow
+                      ? html`<span class="shortcut">
+                          <span
+                            >${isMac
+                              ? html`<ha-svg-icon
+                                  slot="start"
+                                  .path=${mdiAppleKeyboardCommand}
+                                ></ha-svg-icon>`
+                              : this.hass.localize(
+                                  "ui.panel.config.automation.editor.ctrl"
+                                )}</span
+                          >
+                          <span>+</span>
+                          <span>V</span>
+                        </span>`
+                      : nothing}
+                  </div>
                  <ha-svg-icon
                    slot="start"
                    .path=${mdiContentPaste}
@@ -571,7 +612,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
                  ><ha-svg-icon slot="end" .path=${mdiPlus}></ha-svg-icon>
                </ha-md-list-item>
                <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
-            : ""}
+            : nothing}
          ${repeat(
            items,
            (item) => item.key,
@@ -637,6 +678,30 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
    this._filter = ev.detail.value;
  }

+  private _addClipboard = () => {
+    if (this._params?.clipboardItem) {
+      this._params!.add(PASTE_VALUE);
+      showToast(this, {
+        message: this.hass.localize(
+          "ui.panel.config.automation.editor.item_pasted",
+          {
+            item: this.hass.localize(
+              // @ts-ignore
+              `ui.panel.config.automation.editor.${this._params.type}s.type.${this._params.clipboardItem}.label`
+            ),
+          }
+        ),
+      });
+      this.closeDialog();
+    }
+  };
+
+  protected supportedShortcuts(): SupportedShortcuts {
+    return {
+      v: () => this._addClipboard(),
+    };
+  }
+
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -660,6 +725,7 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
          max-width: 100vw;
          --md-list-item-leading-space: 24px;
          --md-list-item-trailing-space: 24px;
+          --md-list-item-supporting-text-font: var(--ha-font-size-s);
        }
        ha-md-list-item img {
          width: 24px;
@@ -668,6 +734,27 @@ class DialogAddAutomationElement extends LitElement implements HassDialog {
          display: block;
          margin: 0 16px;
        }
+        .shortcut-label {
+          display: flex;
+          gap: 12px;
+          justify-content: space-between;
+        }
+        .shortcut-label .supporting-text {
+          color: var(--secondary-text-color);
+          font-size: var(--ha-font-size-s);
+        }
+        .shortcut-label .shortcut {
+          --mdc-icon-size: 12px;
+          display: inline-flex;
+          flex-direction: row;
+          align-items: center;
+          gap: 2px;
+        }
+        .shortcut-label .shortcut span {
+          font-size: var(--ha-font-size-s);
+          font-family: var(--ha-font-family-code);
+          color: var(--ha-color-text-secondary);
+        }
      `,
    ];
  }
--- a/src/panels/config/automation/condition/ha-automation-condition-editor.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-editor.ts
@@ -28,6 +28,8 @@ export default class HaAutomationConditionEditor extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ type: Boolean, attribute: "sidebar" }) public inSidebar = false;
+
  @property({ type: Boolean, reflect: true }) public selected = false;

  @property({ type: Boolean, attribute: "supported" }) public uiSupported =
@@ -55,6 +57,7 @@ export default class HaAutomationConditionEditor extends LitElement {
            (this.condition.enabled === false && !this.yamlMode),
          yaml: yamlMode,
          indent: this.indent,
+          card: !this.inSidebar,
        })}
      >
        ${yamlMode
@@ -100,8 +103,7 @@ export default class HaAutomationConditionEditor extends LitElement {
    if (!ev.detail.isValid) {
      return;
    }
-    // @ts-ignore
-    fireEvent(this, "value-changed", { value: ev.detail.value, yaml: true });
+    fireEvent(this, "yaml-changed", { value: ev.detail.value });
  }

  private _onUiChanged(ev: CustomEvent) {
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -4,12 +4,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiFlask,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -26,6 +26,7 @@ import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-automation-row";
+import type { HaAutomationRow } from "../../../../components/ha-automation-row";
 import "../../../../components/ha-card";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
@@ -52,6 +53,7 @@ import {
  showPromptDialog,
 } from "../../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../../types";
+import { showToast } from "../../../../util/toast";
 import "../ha-automation-editor-warning";
 import { rowStyles } from "../styles";
 import "./ha-automation-condition-editor";
@@ -67,6 +69,7 @@ import "./types/ha-automation-condition-template";
 import "./types/ha-automation-condition-time";
 import "./types/ha-automation-condition-trigger";
 import "./types/ha-automation-condition-zone";
+import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export interface ConditionElement extends LitElement {
  condition: Condition;
@@ -115,6 +118,11 @@ export default class HaAutomationConditionRow extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ type: Boolean }) public highlight?: boolean;
+
+  @property({ type: Boolean, attribute: "sort-selected" })
+  public sortSelected = false;
+
  @state() private _collapsed = true;

  @state() private _warnings?: string[];
@@ -145,6 +153,13 @@ export default class HaAutomationConditionRow extends LitElement {
  @query("ha-automation-condition-editor")
  public conditionEditor?: HaAutomationConditionEditor;

+  @query("ha-automation-row")
+  private _automationRowElement?: HaAutomationRow;
+
+  get selected() {
+    return this._selected;
+  }
+
  private _renderRow() {
    return html`
      <ha-svg-icon
@@ -160,143 +175,140 @@ export default class HaAutomationConditionRow extends LitElement {

      <slot name="icons" slot="icons"></slot>

-      <ha-md-button-menu
-        slot="icons"
-        @click=${preventDefaultStopPropagation}
-        @keydown=${stopPropagation}
-        @closed=${stopPropagation}
-        positioning="fixed"
-      >
-        <ha-icon-button
-          slot="trigger"
-          .label=${this.hass.localize("ui.common.menu")}
-          .path=${mdiDotsVertical}
-        >
-        </ha-icon-button>
+      ${!this.optionsInSidebar
+        ? html`<ha-md-button-menu
+            quick
+            slot="icons"
+            @click=${preventDefaultStopPropagation}
+            @keydown=${stopPropagation}
+            @closed=${stopPropagation}
+            positioning="fixed"
+            anchor-corner="end-end"
+            menu-corner="start-end"
+          >
+            <ha-icon-button
+              slot="trigger"
+              .label=${this.hass.localize("ui.common.menu")}
+              .path=${mdiDotsVertical}
+            >
+            </ha-icon-button>

-        ${!this.optionsInSidebar
-          ? html`
-              <ha-md-menu-item .clickAction=${this._testCondition}>
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.conditions.test"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiFlask}></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-menu-item
-                .clickAction=${this._renameCondition}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.conditions.rename"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item .clickAction=${this._testCondition}>
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.conditions.test"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiFlask}></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._renameCondition}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.conditions.rename"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>

-              <ha-md-menu-item
-                .clickAction=${this._duplicateCondition}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.duplicate"
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiContentDuplicate}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._duplicateCondition}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.duplicate"
+              )}
+              <ha-svg-icon
+                slot="start"
+                .path=${mdiPlusCircleMultipleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._copyCondition}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.copy"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._copyCondition}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.copy"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._cutCondition}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.cut"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-              </ha-md-menu-item>
-            `
-          : nothing}
+            <ha-md-menu-item
+              .clickAction=${this._cutCondition}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.cut"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+            </ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveUp}
-          .disabled=${this.disabled || this.first}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
-          <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._moveUp}
+              .disabled=${this.disabled || this.first}
+            >
+              ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
+              <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
+            ></ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveDown}
-          .disabled=${this.disabled || this.last}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_down")}
-          <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._moveDown}
+              .disabled=${this.disabled || this.last}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.move_down"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
+            ></ha-md-menu-item>

-        ${!this.optionsInSidebar
-          ? html`<ha-md-menu-item
-                .clickAction=${this._toggleYamlMode}
-                .disabled=${this._uiSupported(this.condition.condition) ||
-                !!this._warnings}
-              >
-                ${this.hass.localize(
-                  `ui.panel.config.automation.editor.edit_${!this._yamlMode ? "yaml" : "ui"}`
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiPlaylistEdit}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._toggleYamlMode}
+              .disabled=${this._uiSupported(this.condition.condition) ||
+              !!this._warnings}
+            >
+              ${this.hass.localize(
+                `ui.panel.config.automation.editor.edit_${!this._yamlMode ? "yaml" : "ui"}`
+              )}
+              <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>

-              <ha-md-menu-item
-                .clickAction=${this._onDisable}
-                .disabled=${this.disabled}
-              >
-                ${this.condition.enabled === false
-                  ? this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.enable"
-                    )
-                  : this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.disable"
-                    )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${this.condition.enabled === false
-                    ? mdiPlayCircleOutline
-                    : mdiStopCircleOutline}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-menu-item
+            <ha-md-menu-item
+              .clickAction=${this._onDisable}
+              .disabled=${this.disabled}
+            >
+              ${this.condition.enabled === false
+                ? this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.enable"
+                  )
+                : this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.disable"
+                  )}
+              <ha-svg-icon
+                slot="start"
+                .path=${this.condition.enabled === false
+                  ? mdiPlayCircleOutline
+                  : mdiStopCircleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-menu-item
+              class="warning"
+              .clickAction=${this._onDelete}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.delete"
+              )}
+              <ha-svg-icon
                class="warning"
-                .clickAction=${this._onDelete}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.delete"
-                )}
-                <ha-svg-icon
-                  class="warning"
-                  slot="start"
-                  .path=${mdiDelete}
-                ></ha-svg-icon>
-              </ha-md-menu-item>`
-          : nothing}
-      </ha-md-button-menu>
-
+                slot="start"
+                .path=${mdiDelete}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+          </ha-md-button-menu>`
+        : nothing}
      ${!this.optionsInSidebar
        ? html`${this._warnings
              ? html`<ha-automation-editor-warning
@@ -351,11 +363,16 @@ export default class HaAutomationConditionRow extends LitElement {
              )}
              .collapsed=${this._collapsed}
              .selected=${this._selected}
-              @click=${this._toggleSidebar}
-              @toggle-collapsed=${this._toggleCollapse}
+              .highlight=${this.highlight}
              .buildingBlock=${CONDITION_BUILDING_BLOCKS.includes(
                this.condition.condition
              )}
+              .sortSelected=${this.sortSelected}
+              @click=${this._toggleSidebar}
+              @toggle-collapsed=${this._toggleCollapse}
+              @copy-row=${this._copyCondition}
+              @cut-row=${this._cutCondition}
+              @delete-row=${this._onDelete}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -424,6 +441,7 @@ export default class HaAutomationConditionRow extends LitElement {
      ...this._clipboard,
      condition: deepClone(this.condition),
    };
+    copyToClipboard(JSON.stringify(this.condition));
  }

  private _onDisable = () => {
@@ -472,6 +490,15 @@ export default class HaAutomationConditionRow extends LitElement {
    this._testingResult = undefined;
    this._testing = true;
    const condition = this.condition;
+    requestAnimationFrame(() => {
+      // @ts-ignore is supported in all browsers expect firefox
+      if (this.scrollIntoViewIfNeeded) {
+        // @ts-ignore is supported in all browsers expect firefox
+        this.scrollIntoViewIfNeeded();
+        return;
+      }
+      this.scrollIntoView();
+    });

    try {
      const validateResult = await validateConfig(this.hass, {
@@ -562,6 +589,12 @@ export default class HaAutomationConditionRow extends LitElement {

  private _copyCondition = () => {
    this._setClipboard();
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.conditions.copied_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _cutCondition = () => {
@@ -570,6 +603,12 @@ export default class HaAutomationConditionRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.conditions.cut_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _moveUp = () => {
@@ -643,16 +682,19 @@ export default class HaAutomationConditionRow extends LitElement {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
      },
-      close: () => {
+      close: (focus?: boolean) => {
        this._selected = false;
        fireEvent(this, "close-sidebar");
+        if (focus) {
+          this.focus();
+        }
      },
      rename: () => {
        this._renameCondition();
      },
      toggleYamlMode: () => {
        this._toggleYamlMode();
-        return this._yamlMode;
+        this.openSidebar();
      },
      disable: this._onDisable,
      delete: this._onDelete,
@@ -668,9 +710,11 @@ export default class HaAutomationConditionRow extends LitElement {
    this._collapsed = false;

    if (this.narrow) {
-      this.scrollIntoView({
-        block: "start",
-        behavior: "smooth",
+      requestAnimationFrame(() => {
+        this.scrollIntoView({
+          block: "start",
+          behavior: "smooth",
+        });
      });
    }
  }
@@ -684,6 +728,10 @@ export default class HaAutomationConditionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public focus() {
+    this._automationRowElement?.focus();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      rowStyles,
--- a/src/panels/config/automation/condition/ha-automation-condition.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition.ts
@@ -1,12 +1,11 @@
 import { mdiDrag, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, queryAll, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { listenMediaQuery } from "../../../../common/dom/media_query";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
@@ -43,7 +42,7 @@ export default class HaAutomationCondition extends LitElement {
  @property({ type: Boolean, attribute: "sidebar" }) public optionsInSidebar =
    false;

-  @state() private _showReorder = false;
+  @state() private _rowSortSelected?: number;

  @state()
  @storage({
@@ -59,23 +58,10 @@ export default class HaAutomationCondition extends LitElement {

  private _focusLastConditionOnChange = false;

+  private _focusConditionIndexOnChange?: number;
+
  private _conditionKeys = new WeakMap<Condition, string>();

-  private _unsubMql?: () => void;
-
-  public connectedCallback() {
-    super.connectedCallback();
-    this._unsubMql = listenMediaQuery("(min-width: 600px)", (matches) => {
-      this._showReorder = matches;
-    });
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubMql?.();
-    this._unsubMql = undefined;
-  }
-
  protected updated(changedProperties: PropertyValues) {
    if (!changedProperties.has("conditions")) {
      return;
@@ -100,16 +86,25 @@ export default class HaAutomationCondition extends LitElement {
      fireEvent(this, "value-changed", {
        value: updatedConditions,
      });
-    } else if (this._focusLastConditionOnChange) {
-      this._focusLastConditionOnChange = false;
+    } else if (
+      this._focusLastConditionOnChange ||
+      this._focusConditionIndexOnChange !== undefined
+    ) {
+      const mode = this._focusLastConditionOnChange ? "new" : "moved";
+
      const row = this.shadowRoot!.querySelector<HaAutomationConditionRow>(
-        "ha-automation-condition-row:last-of-type"
+        `ha-automation-condition-row:${mode === "new" ? "last-of-type" : `nth-of-type(${this._focusConditionIndexOnChange! + 1})`}`
      )!;
+
+      this._focusLastConditionOnChange = false;
+      this._focusConditionIndexOnChange = undefined;
+
      row.updateComplete.then(() => {
        // on new condition open the settings in the sidebar, except for building blocks
        if (
          this.optionsInSidebar &&
-          !CONDITION_BUILDING_BLOCKS.includes(row.condition.condition)
+          (!CONDITION_BUILDING_BLOCKS.includes(row.condition.condition) ||
+            mode === "moved")
        ) {
          row.openSidebar();
          if (this.narrow) {
@@ -119,8 +114,14 @@ export default class HaAutomationCondition extends LitElement {
            });
          }
        }
-        row.expand();
-        row.focus();
+
+        if (mode === "new") {
+          row.expand();
+        }
+
+        if (!this.optionsInSidebar) {
+          row.focus();
+        }
      });
    }
  }
@@ -145,14 +146,14 @@ export default class HaAutomationCondition extends LitElement {
      <ha-sortable
        handle-selector=".handle"
        draggable-selector="ha-automation-condition-row"
-        .disabled=${!this._showReorder || this.disabled}
+        .disabled=${this.disabled}
        group="conditions"
        invert-swap
        @item-moved=${this._conditionMoved}
        @item-added=${this._conditionAdded}
        @item-removed=${this._conditionRemoved}
      >
-        <div class="rows">
+        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
            this.conditions.filter((c) => typeof c === "object"),
            (condition) => this._getKey(condition),
@@ -172,12 +173,22 @@ export default class HaAutomationCondition extends LitElement {
                @move-up=${this._moveUp}
                @value-changed=${this._conditionChanged}
                .hass=${this.hass}
-                ?highlight=${this.highlightedConditions?.includes(cond)}
+                .highlight=${this.highlightedConditions?.includes(cond)}
                .optionsInSidebar=${this.optionsInSidebar}
+                .sortSelected=${this._rowSortSelected === idx}
+                @stop-sort-selection=${this._stopSortSelection}
              >
-                ${this._showReorder && !this.disabled
+                ${!this.disabled
                  ? html`
-                      <div class="handle" slot="icons">
+                      <div
+                        tabindex="0"
+                        class="handle ${this._rowSortSelected === idx
+                          ? "active"
+                          : ""}"
+                        slot="icons"
+                        @keydown=${this._handleDragKeydown}
+                        .index=${idx}
+                      >
                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
                      </div>
                    `
@@ -266,15 +277,27 @@ export default class HaAutomationCondition extends LitElement {
  private _moveUp(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index - 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationConditionRow).first) {
+      const newIndex = index - 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _moveDown(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index + 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationConditionRow).last) {
+      const newIndex = index + 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _move(oldIndex: number, newIndex: number) {
@@ -294,6 +317,8 @@ export default class HaAutomationCondition extends LitElement {
  private async _conditionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
+    const item = ev.detail.item as HaAutomationConditionRow;
+    const selected = item.selected;
    let conditions = [
      ...this.conditions.slice(0, index),
      data,
@@ -301,6 +326,9 @@ export default class HaAutomationCondition extends LitElement {
    ];
    // Add condition locally to avoid UI jump
    this.conditions = conditions;
+    if (selected) {
+      this._focusConditionIndexOnChange = conditions.length === 1 ? 0 : index;
+    }
    await nextRender();
    if (this.conditions !== conditions) {
      // Ensure condition is added even after update
@@ -309,6 +337,9 @@ export default class HaAutomationCondition extends LitElement {
        data,
        ...this.conditions.slice(index),
      ];
+      if (selected) {
+        this._focusConditionIndexOnChange = conditions.length === 1 ? 0 : index;
+      }
    }
    fireEvent(this, "value-changed", { value: conditions });
  }
@@ -354,14 +385,21 @@ export default class HaAutomationCondition extends LitElement {
    });
  }

-  static styles = [
-    automationRowsStyles,
-    css`
-      :host([root]) .rows {
-        padding-right: 8px;
-      }
-    `,
-  ];
+  private _handleDragKeydown(ev: KeyboardEvent) {
+    if (ev.key === "Enter" || ev.key === " ") {
+      ev.stopPropagation();
+      this._rowSortSelected =
+        this._rowSortSelected === undefined
+          ? (ev.target as any).index
+          : undefined;
+    }
+  }
+
+  private _stopSortSelection() {
+    this._rowSortSelected = undefined;
+  }
+
+  static styles = automationRowsStyles;
 }

 declare global {
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -1,7 +1,6 @@
 import { consume } from "@lit/context";
 import {
  mdiCog,
-  mdiContentDuplicate,
  mdiContentSave,
  mdiDebugStepOver,
  mdiDelete,
@@ -11,6 +10,7 @@ import {
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiRobotConfused,
  mdiStopCircleOutline,
@@ -337,7 +337,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
            )}
            <ha-svg-icon
              slot="graphic"
-              .path=${mdiContentDuplicate}
+              .path=${mdiPlusCircleMultipleOutline}
            ></ha-svg-icon>
          </ha-list-item>

@@ -432,62 +432,6 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
          class=${this._mode === "yaml" ? "yaml-mode" : ""}
          @subscribe-automation-config=${this._subscribeAutomationConfig}
        >
-          <div class="error-wrapper">
-            ${this._errors || stateObj?.state === UNAVAILABLE
-              ? html`<ha-alert
-                  alert-type="error"
-                  .title=${stateObj?.state === UNAVAILABLE
-                    ? this.hass.localize(
-                        "ui.panel.config.automation.editor.unavailable"
-                      )
-                    : undefined}
-                >
-                  ${this._errors || this._validationErrors}
-                  ${stateObj?.state === UNAVAILABLE
-                    ? html`<ha-svg-icon
-                        slot="icon"
-                        .path=${mdiRobotConfused}
-                      ></ha-svg-icon>`
-                    : nothing}
-                </ha-alert>`
-              : ""}
-            ${this._blueprintConfig
-              ? html`<ha-alert alert-type="info">
-                  ${this.hass.localize(
-                    "ui.panel.config.automation.editor.confirm_take_control"
-                  )}
-                  <div slot="action" style="display: flex;">
-                    <ha-button
-                      appearance="plain"
-                      @click=${this._takeControlSave}
-                      >${this.hass.localize("ui.common.yes")}</ha-button
-                    >
-                    <ha-button
-                      appearance="plain"
-                      @click=${this._revertBlueprint}
-                      >${this.hass.localize("ui.common.no")}</ha-button
-                    >
-                  </div>
-                </ha-alert>`
-              : this._readOnly
-                ? html`<ha-alert alert-type="warning" dismissable
-                    >${this.hass.localize(
-                      "ui.panel.config.automation.editor.read_only"
-                    )}
-                    <ha-button
-                      appearance="filled"
-                      size="small"
-                      variant="warning"
-                      slot="action"
-                      @click=${this._duplicate}
-                    >
-                      ${this.hass.localize(
-                        "ui.panel.config.automation.editor.migrate"
-                      )}
-                    </ha-button>
-                  </ha-alert>`
-                : nothing}
-          </div>
          ${this._mode === "gui"
            ? html`
                <div>
@@ -499,7 +443,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
                          .isWide=${this.isWide}
                          .stateObj=${stateObj}
                          .config=${this._config}
-                          .disabled=${Boolean(this._readOnly)}
+                          .disabled=${this._readOnly}
                          .saving=${this._saving}
                          .dirty=${this._dirty}
                          @value-changed=${this._valueChanged}
@@ -513,13 +457,94 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
                          .isWide=${this.isWide}
                          .stateObj=${stateObj}
                          .config=${this._config}
-                          .disabled=${Boolean(this._readOnly)}
+                          .disabled=${this._readOnly}
                          .dirty=${this._dirty}
                          .saving=${this._saving}
                          @value-changed=${this._valueChanged}
                          @save-automation=${this._handleSaveAutomation}
                          @editor-save=${this._handleSaveAutomation}
-                        ></manual-automation-editor>
+                        >
+                          <div class="alert-wrapper" slot="alerts">
+                            ${this._errors || stateObj?.state === UNAVAILABLE
+                              ? html`<ha-alert
+                                  alert-type="error"
+                                  .title=${stateObj?.state === UNAVAILABLE
+                                    ? this.hass.localize(
+                                        "ui.panel.config.automation.editor.unavailable"
+                                      )
+                                    : undefined}
+                                >
+                                  ${this._errors || this._validationErrors}
+                                  ${stateObj?.state === UNAVAILABLE
+                                    ? html`<ha-svg-icon
+                                        slot="icon"
+                                        .path=${mdiRobotConfused}
+                                      ></ha-svg-icon>`
+                                    : nothing}
+                                </ha-alert>`
+                              : nothing}
+                            ${this._blueprintConfig
+                              ? html`<ha-alert alert-type="info">
+                                  ${this.hass.localize(
+                                    "ui.panel.config.automation.editor.confirm_take_control"
+                                  )}
+                                  <div slot="action" style="display: flex;">
+                                    <ha-button
+                                      appearance="plain"
+                                      @click=${this._takeControlSave}
+                                      >${this.hass.localize(
+                                        "ui.common.yes"
+                                      )}</ha-button
+                                    >
+                                    <ha-button
+                                      appearance="plain"
+                                      @click=${this._revertBlueprint}
+                                      >${this.hass.localize(
+                                        "ui.common.no"
+                                      )}</ha-button
+                                    >
+                                  </div>
+                                </ha-alert>`
+                              : this._readOnly
+                                ? html`<ha-alert
+                                    alert-type="warning"
+                                    dismissable
+                                    >${this.hass.localize(
+                                      "ui.panel.config.automation.editor.read_only"
+                                    )}
+                                    <ha-button
+                                      appearance="filled"
+                                      size="small"
+                                      variant="warning"
+                                      slot="action"
+                                      @click=${this._duplicate}
+                                    >
+                                      ${this.hass.localize(
+                                        "ui.panel.config.automation.editor.migrate"
+                                      )}
+                                    </ha-button>
+                                  </ha-alert>`
+                                : nothing}
+                            ${stateObj?.state === "off"
+                              ? html`
+                                  <ha-alert alert-type="info">
+                                    ${this.hass.localize(
+                                      "ui.panel.config.automation.editor.disabled"
+                                    )}
+                                    <ha-button
+                                      size="small"
+                                      slot="action"
+                                      @click=${this._toggle}
+                                    >
+                                      ${this.hass.localize(
+                                        "ui.panel.config.automation.editor.enable"
+                                      )}
+                                    </ha-button>
+                                  </ha-alert>
+                                `
+                              : nothing}
+                          </div>
+                        </manual-automation-editor>
                      `}
                </div>
              `
@@ -542,7 +567,7 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
                          </ha-button>
                        </ha-alert>
                      `
-                    : ""}
+                    : nothing}
                  <ha-yaml-editor
                    copy-clipboard
                    .hass=${this.hass}
@@ -1113,6 +1138,9 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
  protected supportedShortcuts(): SupportedShortcuts {
    return {
      s: () => this._handleSaveAutomation(),
+      c: () => this._copySelectedRow(),
+      x: () => this._cutSelectedRow(),
+      Delete: () => this._deleteSelectedRow(),
    };
  }

@@ -1132,6 +1160,18 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
    this._manualEditor?.expandAll();
  }

+  private _copySelectedRow() {
+    this._manualEditor?.copySelectedRow();
+  }
+
+  private _cutSelectedRow() {
+    this._manualEditor?.cutSelectedRow();
+  }
+
+  private _deleteSelectedRow() {
+    this._manualEditor?.deleteSelectedRow();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -1156,22 +1196,6 @@ export class HaAutomationEditor extends PreventUnsavedMixin(
          display: block;
        }

-        :not(.yaml-mode) > .error-wrapper {
-          position: absolute;
-          top: 4px;
-          z-index: 3;
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-        }
-
-        :not(.yaml-mode) > .error-wrapper ha-alert {
-          background-color: var(--card-background-color);
-          box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-          border-radius: var(--ha-border-radius-sm);
-        }
-
        manual-automation-editor {
          max-width: 1540px;
          padding: 0 12px;
--- a/src/panels/config/automation/ha-automation-sidebar.ts
+++ b/src/panels/config/automation/ha-automation-sidebar.ts
@@ -1,6 +1,5 @@
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { fireEvent } from "../../../common/dom/fire_event";
 import "../../../components/ha-bottom-sheet";
 import type { HaBottomSheet } from "../../../components/ha-bottom-sheet";
 import {
@@ -34,6 +33,8 @@ export default class HaAutomationSidebar extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _yamlMode = false;

  @query("ha-bottom-sheet") private _bottomSheetElement?: HaBottomSheet;
@@ -52,6 +53,7 @@ export default class HaAutomationSidebar extends LitElement {
          .narrow=${this.narrow}
          .disabled=${this.disabled}
          .yamlMode=${this._yamlMode}
+          .sidebarKey=${this.sidebarKey}
          @toggle-yaml-mode=${this._toggleYamlMode}
          @close-sidebar=${this._handleCloseSidebar}
        ></ha-automation-sidebar-trigger>
@@ -67,6 +69,7 @@ export default class HaAutomationSidebar extends LitElement {
          .narrow=${this.narrow}
          .disabled=${this.disabled}
          .yamlMode=${this._yamlMode}
+          .sidebarKey=${this.sidebarKey}
          @toggle-yaml-mode=${this._toggleYamlMode}
          @close-sidebar=${this._handleCloseSidebar}
        ></ha-automation-sidebar-condition>
@@ -82,6 +85,7 @@ export default class HaAutomationSidebar extends LitElement {
          .narrow=${this.narrow}
          .disabled=${this.disabled}
          .yamlMode=${this._yamlMode}
+          .sidebarKey=${this.sidebarKey}
          @toggle-yaml-mode=${this._toggleYamlMode}
          @close-sidebar=${this._handleCloseSidebar}
        ></ha-automation-sidebar-action>
@@ -110,6 +114,7 @@ export default class HaAutomationSidebar extends LitElement {
          .narrow=${this.narrow}
          .disabled=${this.disabled}
          .yamlMode=${this._yamlMode}
+          .sidebarKey=${this.sidebarKey}
          @toggle-yaml-mode=${this._toggleYamlMode}
          @close-sidebar=${this._handleCloseSidebar}
        ></ha-automation-sidebar-script-field-selector>
@@ -125,6 +130,7 @@ export default class HaAutomationSidebar extends LitElement {
          .narrow=${this.narrow}
          .disabled=${this.disabled}
          .yamlMode=${this._yamlMode}
+          .sidebarKey=${this.sidebarKey}
          @toggle-yaml-mode=${this._toggleYamlMode}
          @close-sidebar=${this._handleCloseSidebar}
        ></ha-automation-sidebar-script-field>
@@ -193,21 +199,16 @@ export default class HaAutomationSidebar extends LitElement {
  }

  private _closeSidebar() {
-    this.config?.close();
+    this.config?.close(true);
  }

  private _toggleYamlMode = () => {
-    this._yamlMode = this.config!.toggleYamlMode();
-    fireEvent(this, "value-changed", {
-      value: {
-        ...this.config,
-        yamlMode: this._yamlMode,
-      },
-    });
+    (this.config as ActionSidebarConfig)?.toggleYamlMode();
  };

  static styles = css`
    :host {
+      z-index: 6;
      outline: none;
      height: 100%;
      --ha-card-border-radius: var(
@@ -235,5 +236,8 @@ declare global {

  interface HASSDomEvents {
    "toggle-yaml-mode": undefined;
+    "yaml-changed": {
+      value: unknown;
+    };
  }
 }
--- a/src/panels/config/automation/manual-automation-editor.ts
+++ b/src/panels/config/automation/manual-automation-editor.ts
@@ -3,7 +3,13 @@ import type { HassEntity } from "home-assistant-js-websocket";
 import { load } from "js-yaml";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import {
+  customElement,
+  property,
+  query,
+  queryAll,
+  state,
+} from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import {
  any,
@@ -23,12 +29,12 @@ import {
  extractSearchParam,
  removeSearchParam,
 } from "../../../common/url/search-params";
-import { computeRTL } from "../../../common/util/compute_rtl";
 import "../../../components/ha-button";
 import "../../../components/ha-fab";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-markdown";
 import type {
+  ActionSidebarConfig,
  AutomationConfig,
  Condition,
  ManualAutomationConfig,
@@ -93,11 +99,15 @@ export class HaManualAutomationEditor extends LitElement {

  @state() private _sidebarConfig?: SidebarConfig;

-  @query(".content")
-  private _contentElement?: HTMLDivElement;
+  @state() private _sidebarKey?: string;

  @query("ha-automation-sidebar") private _sidebarElement?: HaAutomationSidebar;

+  @queryAll("ha-automation-action, ha-automation-condition")
+  private _collapsableElements?: NodeListOf<
+    HaAutomationAction | HaAutomationCondition
+  >;
+
  private _previousConfig?: ManualAutomationConfig;

  public connectedCallback() {
@@ -112,20 +122,6 @@ export class HaManualAutomationEditor extends LitElement {

  private _renderContent() {
    return html`
-      ${this.stateObj?.state === "off"
-        ? html`
-            <ha-alert alert-type="info">
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.disabled"
-              )}
-              <ha-button size="small" slot="action" @click=${this._enable}>
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.enable"
-                )}
-              </ha-button>
-            </ha-alert>
-          `
-        : nothing}
      ${this.config.description
        ? html`<ha-markdown
            class="description"
@@ -274,37 +270,40 @@ export class HaManualAutomationEditor extends LitElement {
    return html`
      <div
        class=${classMap({
-          "split-view": true,
-          "sidebar-hidden": !this._sidebarConfig,
+          "has-sidebar": this._sidebarConfig && !this.narrow,
        })}
      >
        <div class="content-wrapper">
-          <div class="content">${this._renderContent()}</div>
-          <ha-fab
-            slot="fab"
-            class=${this.dirty ? "dirty" : ""}
-            .label=${this.hass.localize("ui.common.save")}
-            .disabled=${this.saving}
-            extended
-            @click=${this._saveAutomation}
-          >
-            <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
-          </ha-fab>
+          <div class="content">
+            <slot name="alerts"></slot>
+            ${this._renderContent()}
+          </div>
+          <div class="fab-positioner">
+            <ha-fab
+              slot="fab"
+              class=${this.dirty ? "dirty" : ""}
+              .label=${this.hass.localize("ui.common.save")}
+              .disabled=${this.saving}
+              extended
+              @click=${this._saveAutomation}
+            >
+              <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
+            </ha-fab>
+          </div>
+        </div>
+        <div class="sidebar-positioner">
+          <ha-automation-sidebar
+            tabindex="-1"
+            class=${classMap({ hidden: !this._sidebarConfig })}
+            .isWide=${this.isWide}
+            .hass=${this.hass}
+            .narrow=${this.narrow}
+            .config=${this._sidebarConfig}
+            @value-changed=${this._sidebarConfigChanged}
+            .disabled=${this.disabled}
+            .sidebarKey=${this._sidebarKey}
+          ></ha-automation-sidebar>
        </div>
-        <ha-automation-sidebar
-          tabindex="-1"
-          class=${classMap({
-            sidebar: true,
-            overlay: !this.isWide && !this.narrow,
-            rtl: computeRTL(this.hass),
-          })}
-          .isWide=${this.isWide}
-          .hass=${this.hass}
-          .narrow=${this.narrow}
-          .config=${this._sidebarConfig}
-          @value-changed=${this._sidebarConfigChanged}
-          .disabled=${this.disabled}
-        ></ha-automation-sidebar>
      </div>
    `;
  }
@@ -330,6 +329,7 @@ export class HaManualAutomationEditor extends LitElement {
    // deselect previous selected row
    this._sidebarConfig?.close?.();
    this._sidebarConfig = ev.detail;
+    this._sidebarKey = JSON.stringify(this._sidebarConfig);

    await this._sidebarElement?.updateComplete;
    this._sidebarElement?.focus();
@@ -355,8 +355,6 @@ export class HaManualAutomationEditor extends LitElement {

  private _handleCloseSidebar() {
    this._sidebarConfig = undefined;
-    // fix content shift when bottom rows are scrolled into view
-    this._contentElement?.scrollIntoView();
  }

  private _triggerChanged(ev: CustomEvent): void {
@@ -386,15 +384,6 @@ export class HaManualAutomationEditor extends LitElement {
    });
  }

-  private async _enable(): Promise<void> {
-    if (!this.hass || !this.stateObj) {
-      return;
-    }
-    await this.hass.callService("automation", "turn_on", {
-      entity_id: this.stateObj.entity_id,
-    });
-  }
-
  private _saveAutomation() {
    this._closeSidebar();
    fireEvent(this, "save-automation");
@@ -501,7 +490,20 @@ export class HaManualAutomationEditor extends LitElement {
    if (normalized) {
      ev.preventDefault();

-      if (this.dirty) {
+      if (
+        Object.keys(normalized).length === 1 &&
+        ensureArray(normalized[Object.keys(normalized)[0]]).length === 1
+      ) {
+        this._appendToExistingConfig(normalized);
+        return;
+      }
+
+      if (
+        this.dirty ||
+        ensureArray(this.config.triggers)?.length ||
+        ensureArray(this.config.conditions)?.length ||
+        ensureArray(this.config.actions)?.length
+      ) {
        const result = await new Promise<boolean>((resolve) => {
          showPasteReplaceDialog(this, {
            domain: "automation",
@@ -610,24 +612,36 @@ export class HaManualAutomationEditor extends LitElement {
    });
  }

-  private _getCollapsableElements() {
-    return this.shadowRoot!.querySelectorAll<
-      HaAutomationAction | HaAutomationCondition
-    >("ha-automation-action, ha-automation-condition");
-  }
-
  public expandAll() {
-    this._getCollapsableElements().forEach((element) => {
+    this._collapsableElements?.forEach((element) => {
      element.expandAll();
    });
  }

  public collapseAll() {
-    this._getCollapsableElements().forEach((element) => {
+    this._collapsableElements?.forEach((element) => {
      element.collapseAll();
    });
  }

+  public copySelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.copy) {
+      (this._sidebarConfig as ActionSidebarConfig).copy();
+    }
+  }
+
+  public cutSelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.cut) {
+      (this._sidebarConfig as ActionSidebarConfig).cut();
+    }
+  }
+
+  public deleteSelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.delete) {
+      (this._sidebarConfig as ActionSidebarConfig).delete();
+    }
+  }
+
  static get styles(): CSSResultGroup {
    return [
      saveFabStyles,
@@ -656,9 +670,8 @@ export class HaManualAutomationEditor extends LitElement {
          line-height: 0;
        }

-        ha-alert {
-          display: block;
-          margin-bottom: 16px;
+        .description {
+          margin-top: 16px;
        }
      `,
    ];
--- a/src/panels/config/automation/option/ha-automation-option-row.ts
+++ b/src/panels/config/automation/option/ha-automation-option-row.ts
@@ -2,9 +2,9 @@ import { consume } from "@lit/context";
 import {
  mdiArrowDown,
  mdiArrowUp,
-  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
 } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
@@ -17,6 +17,7 @@ import { preventDefaultStopPropagation } from "../../../../common/dom/prevent_de
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import { capitalizeFirstLetter } from "../../../../common/string/capitalize-first-letter";
 import "../../../../components/ha-automation-row";
+import type { HaAutomationRow } from "../../../../components/ha-automation-row";
 import "../../../../components/ha-card";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
@@ -63,6 +64,9 @@ export default class HaAutomationOptionRow extends LitElement {
  @property({ type: Boolean, attribute: "sidebar" })
  public optionsInSidebar = false;

+  @property({ type: Boolean, attribute: "sort-selected" })
+  public sortSelected = false;
+
  @state() private _expanded = false;

  @state() private _selected = false;
@@ -79,6 +83,13 @@ export default class HaAutomationOptionRow extends LitElement {
  @query("ha-automation-action")
  private _actionElement?: HaAutomationAction;

+  @query("ha-automation-row")
+  private _automationRowElement?: HaAutomationRow;
+
+  get selected() {
+    return this._selected;
+  }
+
  private _expandedChanged(ev) {
    if (ev.currentTarget.id !== "option") {
      return;
@@ -123,14 +134,17 @@ export default class HaAutomationOptionRow extends LitElement {

      <slot name="icons" slot="icons"></slot>

-      ${this.option
+      ${this.option && !this.optionsInSidebar
        ? html`
            <ha-md-button-menu
+              quick
              slot="icons"
              @click=${preventDefaultStopPropagation}
              @closed=${stopPropagation}
              @keydown=${stopPropagation}
              positioning="fixed"
+              anchor-corner="end-end"
+              menu-corner="start-end"
            >
              <ha-icon-button
                slot="trigger"
@@ -138,35 +152,28 @@ export default class HaAutomationOptionRow extends LitElement {
                .path=${mdiDotsVertical}
              ></ha-icon-button>

-              ${!this.optionsInSidebar
-                ? html`
-                    <ha-md-menu-item
-                      @click=${this._renameOption}
-                      .disabled=${this.disabled}
-                    >
-                      ${this.hass.localize(
-                        "ui.panel.config.automation.editor.actions.rename"
-                      )}
-                      <ha-svg-icon
-                        slot="graphic"
-                        .path=${mdiRenameBox}
-                      ></ha-svg-icon>
-                    </ha-md-menu-item>
+              <ha-md-menu-item
+                @click=${this._renameOption}
+                .disabled=${this.disabled}
+              >
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.rename"
+                )}
+                <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+              </ha-md-menu-item>

-                    <ha-md-menu-item
-                      @click=${this._duplicateOption}
-                      .disabled=${this.disabled}
-                    >
-                      ${this.hass.localize(
-                        "ui.panel.config.automation.editor.actions.duplicate"
-                      )}
-                      <ha-svg-icon
-                        slot="graphic"
-                        .path=${mdiContentDuplicate}
-                      ></ha-svg-icon>
-                    </ha-md-menu-item>
-                  `
-                : nothing}
+              <ha-md-menu-item
+                @click=${this._duplicateOption}
+                .disabled=${this.disabled}
+              >
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.duplicate"
+                )}
+                <ha-svg-icon
+                  slot="start"
+                  .path=${mdiPlusCircleMultipleOutline}
+                ></ha-svg-icon>
+              </ha-md-menu-item>

              <ha-md-menu-item
                @click=${this._moveUp}
@@ -175,7 +182,7 @@ export default class HaAutomationOptionRow extends LitElement {
                ${this.hass.localize(
                  "ui.panel.config.automation.editor.move_up"
                )}
-                <ha-svg-icon slot="graphic" .path=${mdiArrowUp}></ha-svg-icon>
+                <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon>
              </ha-md-menu-item>

              <ha-md-menu-item
@@ -185,25 +192,23 @@ export default class HaAutomationOptionRow extends LitElement {
                ${this.hass.localize(
                  "ui.panel.config.automation.editor.move_down"
                )}
-                <ha-svg-icon slot="graphic" .path=${mdiArrowDown}></ha-svg-icon>
+                <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon>
              </ha-md-menu-item>

-              ${!this.optionsInSidebar
-                ? html`<ha-md-menu-item
-                    @click=${this._removeOption}
-                    class="warning"
-                    .disabled=${this.disabled}
-                  >
-                    ${this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.type.choose.remove_option"
-                    )}
-                    <ha-svg-icon
-                      class="warning"
-                      slot="graphic"
-                      .path=${mdiDelete}
-                    ></ha-svg-icon>
-                  </ha-md-menu-item>`
-                : nothing}
+              <ha-md-menu-item
+                @click=${this._removeOption}
+                class="warning"
+                .disabled=${this.disabled}
+              >
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.type.choose.remove_option"
+                )}
+                <ha-svg-icon
+                  class="warning"
+                  slot="start"
+                  .path=${mdiDelete}
+                ></ha-svg-icon>
+              </ha-md-menu-item>
            </ha-md-button-menu>
          `
        : nothing}
@@ -215,6 +220,7 @@ export default class HaAutomationOptionRow extends LitElement {
    return html`<div
      class=${classMap({
        "card-content": true,
+        card: !this.optionsInSidebar,
        indent: this.optionsInSidebar,
        selected: this._selected,
        hidden: this.optionsInSidebar && this._collapsed,
@@ -269,8 +275,10 @@ export default class HaAutomationOptionRow extends LitElement {
              left-chevron
              .collapsed=${this._collapsed}
              .selected=${this._selected}
+              .sortSelected=${this.sortSelected}
              @click=${this._toggleSidebar}
              @toggle-collapsed=${this._toggleCollapse}
+              @delete-row=${this._removeOption}
              >${this._renderRow()}</ha-automation-row
            >`
          : html`
@@ -382,14 +390,16 @@ export default class HaAutomationOptionRow extends LitElement {

  public openSidebar(): void {
    fireEvent(this, "open-sidebar", {
-      close: () => {
+      close: (focus?: boolean) => {
        this._selected = false;
        fireEvent(this, "close-sidebar");
+        if (focus) {
+          this.focus();
+        }
      },
      rename: () => {
        this._renameOption();
      },
-      toggleYamlMode: () => false, // no yaml mode for options
      delete: this._removeOption,
      duplicate: this._duplicateOption,
      defaultOption: !!this.defaultActions,
@@ -398,9 +408,11 @@ export default class HaAutomationOptionRow extends LitElement {
    this._collapsed = false;

    if (this.narrow) {
-      this.scrollIntoView({
-        block: "start",
-        behavior: "smooth",
+      requestAnimationFrame(() => {
+        this.scrollIntoView({
+          block: "start",
+          behavior: "smooth",
+        });
      });
    }
  }
@@ -438,6 +450,10 @@ export default class HaAutomationOptionRow extends LitElement {
    this._collapsed = !this._collapsed;
  }

+  public focus() {
+    this._automationRowElement?.focus();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      rowStyles,
--- a/src/panels/config/automation/option/ha-automation-option.ts
+++ b/src/panels/config/automation/option/ha-automation-option.ts
@@ -1,12 +1,11 @@
 import { mdiDrag, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
-import { LitElement, html, nothing } from "lit";
+import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, queryAll, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { listenMediaQuery } from "../../../../common/dom/media_query";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-sortable";
@@ -34,7 +33,7 @@ export default class HaAutomationOption extends LitElement {
  @property({ type: Boolean, attribute: "show-default" })
  public showDefaultActions = false;

-  @state() private _showReorder = false;
+  @state() private _rowSortSelected?: number;

  @state()
  @storage({
@@ -50,36 +49,23 @@ export default class HaAutomationOption extends LitElement {

  private _focusLastOptionOnChange = false;

+  private _focusOptionIndexOnChange?: number;
+
  private _optionsKeys = new WeakMap<Option, string>();

-  private _unsubMql?: () => void;
-
-  public connectedCallback() {
-    super.connectedCallback();
-    this._unsubMql = listenMediaQuery("(min-width: 600px)", (matches) => {
-      this._showReorder = matches;
-    });
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubMql?.();
-    this._unsubMql = undefined;
-  }
-
  protected render() {
    return html`
      <ha-sortable
        handle-selector=".handle"
        draggable-selector="ha-automation-option-row"
-        .disabled=${!this._showReorder || this.disabled}
+        .disabled=${this.disabled}
        group="options"
        invert-swap
        @item-moved=${this._optionMoved}
        @item-added=${this._optionAdded}
        @item-removed=${this._optionRemoved}
      >
-        <div class="rows">
+        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
            this.options,
            (option) => this._getKey(option),
@@ -98,10 +84,20 @@ export default class HaAutomationOption extends LitElement {
                @value-changed=${this._optionChanged}
                .hass=${this.hass}
                .optionsInSidebar=${this.optionsInSidebar}
+                .sortSelected=${this._rowSortSelected === idx}
+                @stop-sort-selection=${this._stopSortSelection}
              >
-                ${this._showReorder && !this.disabled
+                ${!this.disabled
                  ? html`
-                      <div class="handle" slot="icons">
+                      <div
+                        tabindex="0"
+                        class="handle ${this._rowSortSelected === idx
+                          ? "active"
+                          : ""}"
+                        slot="icons"
+                        @keydown=${this._handleDragKeydown}
+                        .index=${idx}
+                      >
                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
                      </div>
                    `
@@ -143,12 +139,20 @@ export default class HaAutomationOption extends LitElement {
  protected updated(changedProps: PropertyValues) {
    super.updated(changedProps);

-    if (changedProps.has("options") && this._focusLastOptionOnChange) {
-      this._focusLastOptionOnChange = false;
+    if (
+      changedProps.has("options") &&
+      (this._focusLastOptionOnChange ||
+        this._focusOptionIndexOnChange !== undefined)
+    ) {
+      const mode = this._focusLastOptionOnChange ? "new" : "moved";

      const row = this.shadowRoot!.querySelector<HaAutomationOptionRow>(
-        "ha-automation-option-row:last-of-type"
+        `ha-automation-option-row:${mode === "new" ? "last-of-type" : `nth-of-type(${this._focusOptionIndexOnChange! + 1})`}`
      )!;
+
+      this._focusLastOptionOnChange = false;
+      this._focusOptionIndexOnChange = undefined;
+
      row.updateComplete.then(() => {
        if (this.narrow) {
          row.scrollIntoView({
@@ -156,8 +160,16 @@ export default class HaAutomationOption extends LitElement {
            behavior: "smooth",
          });
        }
-        row.expand();
-        row.focus();
+
+        if (mode === "new") {
+          row.expand();
+        }
+
+        if (this.optionsInSidebar) {
+          row.openSidebar();
+        } else {
+          row.focus();
+        }
      });
    }
  }
@@ -187,15 +199,27 @@ export default class HaAutomationOption extends LitElement {
  private _moveUp(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index - 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationOptionRow).first) {
+      const newIndex = index - 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _moveDown(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index + 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationOptionRow).last) {
+      const newIndex = index + 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _move(oldIndex: number, newIndex: number) {
@@ -215,6 +239,9 @@ export default class HaAutomationOption extends LitElement {
  private async _optionAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
+    const item = ev.detail.item as HaAutomationOptionRow;
+    const selected = item.selected;
+
    const options = [
      ...this.options.slice(0, index),
      data,
@@ -222,6 +249,9 @@ export default class HaAutomationOption extends LitElement {
    ];
    // Add option locally to avoid UI jump
    this.options = options;
+    if (selected) {
+      this._focusOptionIndexOnChange = options.length === 1 ? 0 : index;
+    }
    await nextRender();
    fireEvent(this, "value-changed", { value: this.options });
  }
@@ -269,7 +299,28 @@ export default class HaAutomationOption extends LitElement {
    fireEvent(this, "show-default-actions");
  };

-  static styles = automationRowsStyles;
+  private _handleDragKeydown(ev: KeyboardEvent) {
+    if (ev.key === "Enter" || ev.key === " ") {
+      ev.stopPropagation();
+      this._rowSortSelected =
+        this._rowSortSelected === undefined
+          ? (ev.target as any).index
+          : undefined;
+    }
+  }
+
+  private _stopSortSelection() {
+    this._rowSortSelected = undefined;
+  }
+
+  static styles = [
+    automationRowsStyles,
+    css`
+      :host([root]) .rows {
+        padding-right: 8px;
+      }
+    `,
+  ];
 }

 declare global {
--- a/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts
+++ b/src/panels/config/automation/paste-replace-dialog/dialog-paste-replace.ts
@@ -1,11 +1,12 @@
-import { customElement, property, state } from "lit/decorators";
 import { css, type CSSResultGroup, html, LitElement, nothing } from "lit";
-import type { HassDialog } from "../../../../dialogs/make-dialog-manager";
-import type { HomeAssistant } from "../../../../types";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import "../../../../components/ha-button";
 import { createCloseHeading } from "../../../../components/ha-dialog";
-import "../trigger/ha-automation-trigger-row";
+import "../../../../components/ha-yaml-editor";
+import type { HassDialog } from "../../../../dialogs/make-dialog-manager";
+import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import type { HomeAssistant } from "../../../../types";
 import type { PasteReplaceDialogParams } from "./show-dialog-paste-replace";

@customElement("ha-dialog-paste-replace")
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-action.ts
@@ -1,16 +1,18 @@
 import {
+  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiPlay,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
-import { html, LitElement } from "lit";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
@@ -20,6 +22,7 @@ import { ACTION_BUILDING_BLOCKS } from "../../../../data/action";
 import type { ActionSidebarConfig } from "../../../../data/automation";
 import type { RepeatAction } from "../../../../data/script";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { getAutomationActionType } from "../action/ha-automation-action-row";
 import { getRepeatType } from "../action/types/ha-automation-action-repeat";
@@ -41,6 +44,8 @@ export default class HaAutomationSidebarAction extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -100,18 +105,24 @@ export default class HaAutomationSidebarAction extends LitElement {
      <span slot="subtitle">${subtitle}</span>

      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.run}>
-        ${this.hass.localize("ui.panel.config.automation.editor.actions.run")}
        <ha-svg-icon slot="start" .path=${mdiPlay}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize("ui.panel.config.automation.editor.actions.run")}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.rename}
        .disabled=${!!disabled}
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.triggers.rename"
-        )}
        <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.rename"
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -123,36 +134,85 @@ export default class HaAutomationSidebarAction extends LitElement {
        .clickAction=${this.config.duplicate}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.duplicate"
-        )}
-        <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
+        <ha-svg-icon
+          slot="start"
+          .path=${mdiPlusCircleMultipleOutline}
+        ></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.duplicate"
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.copy}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize("ui.panel.config.automation.editor.triggers.copy")}
        <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.copy"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span>C</span>
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.cut}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize("ui.panel.config.automation.editor.triggers.cut")}
        <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.cut"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span>X</span>
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this._toggleYamlMode}
        .disabled=${!this.config.uiSupported || !!this._warnings}
      >
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -160,13 +220,16 @@ export default class HaAutomationSidebarAction extends LitElement {
        tabindex="-1"
      ></ha-md-divider>
      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.disable}>
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-        )}
        <ha-svg-icon
          slot="start"
          .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
        ></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -174,25 +237,51 @@ export default class HaAutomationSidebarAction extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.delete"
-        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.delete"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span
+                  >${this.hass.localize(
+                    "ui.panel.config.automation.editor.del"
+                  )}</span
+                >
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
      ${description && !this.yamlMode
        ? html`<div class="description">${description}</div>`
-        : html`<ha-automation-action-editor
-            class="sidebar-editor"
-            .hass=${this.hass}
-            .action=${actionConfig}
-            .yamlMode=${this.yamlMode}
-            .uiSupported=${this.config.uiSupported}
-            @value-changed=${this._valueChangedSidebar}
-            sidebar
-            narrow
-            .disabled=${this.disabled}
-            @ui-mode-not-available=${this._handleUiModeNotAvailable}
-          ></ha-automation-action-editor>`}
+        : keyed(
+            this.sidebarKey,
+            html`<ha-automation-action-editor
+              class="sidebar-editor"
+              .hass=${this.hass}
+              .action=${actionConfig}
+              .yamlMode=${this.yamlMode}
+              .uiSupported=${this.config.uiSupported}
+              @value-changed=${this._valueChangedSidebar}
+              @yaml-changed=${this._yamlChangedSidebar}
+              sidebar
+              narrow
+              .disabled=${this.disabled}
+              @ui-mode-not-available=${this._handleUiModeNotAvailable}
+            ></ha-automation-action-editor>`
+          )}
    </ha-automation-sidebar-card>`;
  }

@@ -220,6 +309,12 @@ export default class HaAutomationSidebarAction extends LitElement {
    }
  }

+  private _yamlChangedSidebar(ev: CustomEvent) {
+    ev.stopPropagation();
+
+    this.config?.save?.(ev.detail.value);
+  }
+
  private _toggleYamlMode = () => {
    fireEvent(this, "toggle-yaml-mode");
  };
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-card.ts
@@ -67,10 +67,13 @@ export default class HaAutomationSidebarCard extends LitElement {
          <slot slot="subtitle" name="subtitle"></slot>
          <slot name="overflow-menu" slot="actionItems">
            <ha-md-button-menu
+              quick
              @click=${this._openOverflowMenu}
              @keydown=${stopPropagation}
              @closed=${stopPropagation}
              .positioning=${this.narrow ? "absolute" : "fixed"}
+              anchor-corner="end-end"
+              menu-corner="start-end"
            >
              <ha-icon-button
                slot="trigger"
@@ -122,6 +125,7 @@ export default class HaAutomationSidebarCard extends LitElement {
    @media all and (max-width: 870px) {
      ha-card.mobile {
        border: none;
+        box-shadow: none;
      }
      ha-card.mobile {
        border-bottom-right-radius: var(--ha-border-radius-square);
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-condition.ts
@@ -1,21 +1,30 @@
 import {
+  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiFlask,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
-import { html, LitElement } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
-import type { ConditionSidebarConfig } from "../../../../data/automation";
+import {
+  testCondition,
+  type ConditionSidebarConfig,
+} from "../../../../data/automation";
 import { CONDITION_BUILDING_BLOCKS } from "../../../../data/condition";
+import { validateConfig } from "../../../../data/config";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
+import { showAlertDialog } from "../../../lovelace/custom-card-helpers";
 import "../condition/ha-automation-condition-editor";
 import type HaAutomationConditionEditor from "../condition/ha-automation-condition-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -35,8 +44,14 @@ export default class HaAutomationSidebarCondition extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _warnings?: string[];

+  @state() private _testing = false;
+
+  @state() private _testingResult?: boolean;
+
  @query(".sidebar-editor")
  public editor?: HaAutomationConditionEditor;

@@ -85,21 +100,27 @@ export default class HaAutomationSidebarCondition extends LitElement {
    >
      <span slot="title">${title}</span>
      <span slot="subtitle">${subtitle}</span>
-      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.test}>
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.conditions.test"
-        )}
+      <ha-md-menu-item slot="menu-items" .clickAction=${this._testCondition}>
        <ha-svg-icon slot="start" .path=${mdiFlask}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.test"
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this.config.rename}
        .disabled=${!!disabled}
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.triggers.rename"
-        )}
        <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.rename"
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>

      <ha-md-divider
@@ -113,10 +134,16 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.duplicate}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.duplicate"
-        )}
-        <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
+        <ha-svg-icon
+          slot="start"
+          .path=${mdiPlusCircleMultipleOutline}
+        ></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.duplicate"
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>

      <ha-md-menu-item
@@ -124,8 +151,28 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.copy}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize("ui.panel.config.automation.editor.triggers.copy")}
        <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.copy"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span>C</span>
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>

      <ha-md-menu-item
@@ -133,18 +180,41 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .clickAction=${this.config.cut}
        .disabled=${this.disabled}
      >
-        ${this.hass.localize("ui.panel.config.automation.editor.triggers.cut")}
        <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.triggers.cut"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span>X</span>
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
        .clickAction=${this._toggleYamlMode}
        .disabled=${!this.config.uiSupported || !!this._warnings}
      >
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-divider
        slot="menu-items"
@@ -152,13 +222,16 @@ export default class HaAutomationSidebarCondition extends LitElement {
        tabindex="-1"
      ></ha-md-divider>
      <ha-md-menu-item slot="menu-items" .clickAction=${this.config.disable}>
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-        )}
        <ha-svg-icon
          slot="start"
          .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
        ></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -166,26 +239,125 @@ export default class HaAutomationSidebarCondition extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.delete"
-        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.delete"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span
+                  >${this.hass.localize(
+                    "ui.panel.config.automation.editor.del"
+                  )}</span
+                >
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
      ${description && !this.yamlMode
        ? html`<div class="description">${description}</div>`
-        : html`<ha-automation-condition-editor
-            class="sidebar-editor"
-            .hass=${this.hass}
-            .condition=${this.config.config}
-            .yamlMode=${this.yamlMode}
-            .uiSupported=${this.config.uiSupported}
-            @value-changed=${this._valueChangedSidebar}
-            .disabled=${this.disabled}
-            @ui-mode-not-available=${this._handleUiModeNotAvailable}
-          ></ha-automation-condition-editor> `}
+        : keyed(
+            this.sidebarKey,
+            html`<ha-automation-condition-editor
+              class="sidebar-editor"
+              .hass=${this.hass}
+              .condition=${this.config.config}
+              .yamlMode=${this.yamlMode}
+              .uiSupported=${this.config.uiSupported}
+              @value-changed=${this._valueChangedSidebar}
+              @yaml-changed=${this._yamlChangedSidebar}
+              .disabled=${this.disabled}
+              @ui-mode-not-available=${this._handleUiModeNotAvailable}
+              sidebar
+            ></ha-automation-condition-editor>`
+          )}
+      <div
+        class="testing ${classMap({
+          active: this._testing,
+          pass: this._testingResult === true,
+          error: this._testingResult === false,
+        })}"
+      >
+        ${this._testingResult
+          ? this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.testing_pass"
+            )
+          : this.hass.localize(
+              "ui.panel.config.automation.editor.conditions.testing_error"
+            )}
+      </div>
    </ha-automation-sidebar-card>`;
  }

+  private _testCondition = async () => {
+    if (this._testing) {
+      return;
+    }
+    this._testingResult = undefined;
+    this._testing = true;
+    const condition = this.config.config;
+
+    try {
+      const validateResult = await validateConfig(this.hass, {
+        conditions: condition,
+      });
+
+      // Abort if condition changed.
+      if (this.config.config !== condition) {
+        this._testing = false;
+        return;
+      }
+
+      if (!validateResult.conditions.valid) {
+        showAlertDialog(this, {
+          title: this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.invalid_condition"
+          ),
+          text: validateResult.conditions.error,
+        });
+        this._testing = false;
+        return;
+      }
+
+      let result: { result: boolean };
+      try {
+        result = await testCondition(this.hass, condition);
+      } catch (err: any) {
+        if (this.config.config !== condition) {
+          this._testing = false;
+          return;
+        }
+
+        showAlertDialog(this, {
+          title: this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.test_failed"
+          ),
+          text: err.message,
+        });
+        this._testing = false;
+        return;
+      }
+
+      this._testingResult = result.result;
+    } finally {
+      setTimeout(() => {
+        this._testing = false;
+      }, 2500);
+    }
+  };
+
  private _handleUiModeNotAvailable(ev: CustomEvent) {
    this._warnings = handleStructError(this.hass, ev.detail).warnings;
    if (!this.yamlMode) {
@@ -208,11 +380,57 @@ export default class HaAutomationSidebarCondition extends LitElement {
    }
  }

+  private _yamlChangedSidebar(ev: CustomEvent) {
+    ev.stopPropagation();
+
+    this.config?.save?.(ev.detail.value);
+  }
+
  private _toggleYamlMode = () => {
    fireEvent(this, "toggle-yaml-mode");
  };

-  static styles = sidebarEditorStyles;
+  static styles = [
+    sidebarEditorStyles,
+    css`
+      ha-automation-sidebar-card {
+        position: relative;
+      }
+      .testing {
+        position: absolute;
+        z-index: 6;
+        top: 0px;
+        right: 0px;
+        left: 0px;
+        text-transform: uppercase;
+        font-size: var(--ha-font-size-m);
+        font-weight: var(--ha-font-weight-bold);
+        background-color: var(--divider-color, #e0e0e0);
+        color: var(--text-primary-color);
+        max-height: 0px;
+        overflow: hidden;
+        transition: max-height 0.3s;
+        text-align: center;
+        border-top-right-radius: var(
+          --ha-card-border-radius,
+          var(--ha-border-radius-lg)
+        );
+        border-top-left-radius: var(
+          --ha-card-border-radius,
+          var(--ha-border-radius-lg)
+        );
+      }
+      .testing.active {
+        max-height: 100px;
+      }
+      .testing.error {
+        background-color: var(--accent-color);
+      }
+      .testing.pass {
+        background-color: var(--success-color);
+      }
+    `,
+  ];
 }

 declare global {
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-option.ts
@@ -1,8 +1,14 @@
-import { mdiContentDuplicate, mdiDelete, mdiRenameBox } from "@mdi/js";
-import { html, LitElement } from "lit";
+import {
+  mdiAppleKeyboardCommand,
+  mdiDelete,
+  mdiPlusCircleMultipleOutline,
+  mdiRenameBox,
+} from "@mdi/js";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import type { OptionSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";
@@ -52,10 +58,13 @@ export default class HaAutomationSidebarOption extends LitElement {
              .clickAction=${this.config.rename}
              .disabled=${!!disabled}
            >
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.triggers.rename"
-              )}
              <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.triggers.rename"
+                )}
+                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+              </div>
            </ha-md-menu-item>

            <ha-md-menu-item
@@ -63,13 +72,16 @@ export default class HaAutomationSidebarOption extends LitElement {
              @click=${this.config.duplicate}
              .disabled=${this.disabled}
            >
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.duplicate"
-              )}
              <ha-svg-icon
-                slot="graphic"
-                .path=${mdiContentDuplicate}
+                slot="start"
+                .path=${mdiPlusCircleMultipleOutline}
              ></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.duplicate"
+                )}
+                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+              </div>
            </ha-md-menu-item>
            <ha-md-divider
              slot="menu-items"
@@ -82,10 +94,32 @@ export default class HaAutomationSidebarOption extends LitElement {
              .disabled=${this.disabled}
              class="warning"
            >
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.actions.type.choose.remove_option"
-              )}
              <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.actions.type.choose.remove_option"
+                )}
+                ${!this.narrow
+                  ? html`<span class="shortcut">
+                      <span
+                        >${isMac
+                          ? html`<ha-svg-icon
+                              slot="start"
+                              .path=${mdiAppleKeyboardCommand}
+                            ></ha-svg-icon>`
+                          : this.hass.localize(
+                              "ui.panel.config.automation.editor.ctrl"
+                            )}</span
+                      >
+                      <span>+</span>
+                      <span
+                        >${this.hass.localize(
+                          "ui.panel.config.automation.editor.del"
+                        )}</span
+                      >
+                    </span>`
+                  : nothing}
+              </div>
            </ha-md-menu-item>
          `}

--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field-selector.ts
@@ -1,10 +1,12 @@
-import { mdiDelete, mdiPlaylistEdit } from "@mdi/js";
-import { html, LitElement } from "lit";
+import { mdiAppleKeyboardCommand, mdiDelete, mdiPlaylistEdit } from "@mdi/js";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import type { ScriptFieldSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
 import "../../script/ha-script-field-selector-editor";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -24,6 +26,8 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -65,10 +69,13 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {
        .clickAction=${this._toggleYamlMode}
        .disabled=${!!this._warnings}
      >
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -76,19 +83,45 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.delete"
-        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.delete"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span
+                  >${this.hass.localize(
+                    "ui.panel.config.automation.editor.del"
+                  )}</span
+                >
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
-      <ha-script-field-selector-editor
-        class="sidebar-editor"
-        .hass=${this.hass}
-        .field=${this.config.config.field}
-        .disabled=${this.disabled}
-        @value-changed=${this._valueChangedSidebar}
-        .yamlMode=${this.yamlMode}
-      ></ha-script-field-selector-editor>
+      ${keyed(
+        this.sidebarKey,
+        html`<ha-script-field-selector-editor
+          class="sidebar-editor"
+          .hass=${this.hass}
+          .field=${this.config.config.field}
+          .disabled=${this.disabled}
+          @value-changed=${this._valueChangedSidebar}
+          @yaml-changed=${this._yamlChangedSidebar}
+          .yamlMode=${this.yamlMode}
+        ></ha-script-field-selector-editor>`
+      )}
    </ha-automation-sidebar-card>`;
  }

@@ -116,6 +149,12 @@ export default class HaAutomationSidebarScriptFieldSelector extends LitElement {
    }
  }

+  private _yamlChangedSidebar(ev: CustomEvent) {
+    ev.stopPropagation();
+
+    this.config?.save?.(ev.detail.value);
+  }
+
  private _toggleYamlMode = () => {
    fireEvent(this, "toggle-yaml-mode");
  };
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-script-field.ts
@@ -1,9 +1,11 @@
-import { mdiDelete, mdiPlaylistEdit } from "@mdi/js";
-import { html, LitElement } from "lit";
+import { mdiAppleKeyboardCommand, mdiDelete, mdiPlaylistEdit } from "@mdi/js";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import type { ScriptFieldSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
 import "../../script/ha-script-field-editor";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { sidebarEditorStyles } from "../styles";
@@ -23,6 +25,8 @@ export default class HaAutomationSidebarScriptField extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -58,10 +62,13 @@ export default class HaAutomationSidebarScriptField extends LitElement {
        .clickAction=${this._toggleYamlMode}
        .disabled=${!!this._warnings}
      >
-        ${this.hass.localize(
-          `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-        )}
        <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+          )}
+          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+        </div>
      </ha-md-menu-item>
      <ha-md-menu-item
        slot="menu-items"
@@ -69,21 +76,47 @@ export default class HaAutomationSidebarScriptField extends LitElement {
        .disabled=${this.disabled}
        class="warning"
      >
-        ${this.hass.localize(
-          "ui.panel.config.automation.editor.actions.delete"
-        )}
        <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+        <div class="overflow-label">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.actions.delete"
+          )}
+          ${!this.narrow
+            ? html`<span class="shortcut">
+                <span
+                  >${isMac
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${mdiAppleKeyboardCommand}
+                      ></ha-svg-icon>`
+                    : this.hass.localize(
+                        "ui.panel.config.automation.editor.ctrl"
+                      )}</span
+                >
+                <span>+</span>
+                <span
+                  >${this.hass.localize(
+                    "ui.panel.config.automation.editor.del"
+                  )}</span
+                >
+              </span>`
+            : nothing}
+        </div>
      </ha-md-menu-item>
-      <ha-script-field-editor
-        class="sidebar-editor"
-        .hass=${this.hass}
-        .field=${this.config.config.field}
-        .key=${this.config.config.key}
-        .excludeKeys=${this.config.config.excludeKeys}
-        .disabled=${this.disabled}
-        .yamlMode=${this.yamlMode}
-        @value-changed=${this._valueChangedSidebar}
-      ></ha-script-field-editor>
+      ${keyed(
+        this.sidebarKey,
+        html`<ha-script-field-editor
+          class="sidebar-editor"
+          .hass=${this.hass}
+          .field=${this.config.config.field}
+          .key=${this.config.config.key}
+          .excludeKeys=${this.config.config.excludeKeys}
+          .disabled=${this.disabled}
+          .yamlMode=${this.yamlMode}
+          @value-changed=${this._valueChangedSidebar}
+          @yaml-changed=${this._yamlChangedSidebar}
+        ></ha-script-field-editor>`
+      )}
    </ha-automation-sidebar-card>`;
  }

@@ -110,6 +143,12 @@ export default class HaAutomationSidebarScriptField extends LitElement {
    }
  }

+  private _yamlChangedSidebar(ev: CustomEvent) {
+    ev.stopPropagation();
+
+    this.config?.save?.(ev.detail.value);
+  }
+
  private _toggleYamlMode = () => {
    fireEvent(this, "toggle-yaml-mode");
  };
--- a/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
+++ b/src/panels/config/automation/sidebar/ha-automation-sidebar-trigger.ts
@@ -1,21 +1,24 @@
 import {
+  mdiAppleKeyboardCommand,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
+import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
 import type { TriggerSidebarConfig } from "../../../../data/automation";
 import { isTriggerList } from "../../../../data/trigger";
 import type { HomeAssistant } from "../../../../types";
+import { isMac } from "../../../../util/is_mac";
 import { sidebarEditorStyles } from "../styles";
 import "../trigger/ha-automation-trigger-editor";
 import type HaAutomationTriggerEditor from "../trigger/ha-automation-trigger-editor";
@@ -35,6 +38,8 @@ export default class HaAutomationSidebarTrigger extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ attribute: "sidebar-key" }) public sidebarKey?: string;
+
  @state() private _requestShowId = false;

  @state() private _warnings?: string[];
@@ -86,10 +91,13 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.rename}
          .disabled=${disabled || type === "list"}
        >
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.rename"
-          )}
          <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              "ui.panel.config.automation.editor.triggers.rename"
+            )}
+            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+          </div>
        </ha-md-menu-item>
        ${!this.yamlMode &&
        !("id" in this.config.config) &&
@@ -99,10 +107,13 @@ export default class HaAutomationSidebarTrigger extends LitElement {
              .clickAction=${this._showTriggerId}
              .disabled=${disabled || type === "list"}
            >
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.triggers.edit_id"
-              )}
              <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  "ui.panel.config.automation.editor.triggers.edit_id"
+                )}
+                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+              </div>
            </ha-md-menu-item>`
          : nothing}

@@ -120,7 +131,10 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          ${this.hass.localize(
            "ui.panel.config.automation.editor.triggers.duplicate"
          )}
-          <ha-svg-icon slot="start" .path=${mdiContentDuplicate}></ha-svg-icon>
+          <ha-svg-icon
+            slot="start"
+            .path=${mdiPlusCircleMultipleOutline}
+          ></ha-svg-icon>
        </ha-md-menu-item>

        <ha-md-menu-item
@@ -128,10 +142,28 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.copy}
          .disabled=${this.disabled}
        >
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.copy"
-          )}
          <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              "ui.panel.config.automation.editor.triggers.copy"
+            )}
+            ${!this.narrow
+              ? html`<span class="shortcut">
+                  <span
+                    >${isMac
+                      ? html`<ha-svg-icon
+                          slot="start"
+                          .path=${mdiAppleKeyboardCommand}
+                        ></ha-svg-icon>`
+                      : this.hass.localize(
+                          "ui.panel.config.automation.editor.ctrl"
+                        )}</span
+                  >
+                  <span>+</span>
+                  <span>C</span>
+                </span>`
+              : nothing}
+          </div>
        </ha-md-menu-item>

        <ha-md-menu-item
@@ -139,20 +171,41 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.cut}
          .disabled=${this.disabled}
        >
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.triggers.cut"
-          )}
          <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              "ui.panel.config.automation.editor.triggers.cut"
+            )}
+            ${!this.narrow
+              ? html`<span class="shortcut">
+                  <span
+                    >${isMac
+                      ? html`<ha-svg-icon
+                          slot="start"
+                          .path=${mdiAppleKeyboardCommand}
+                        ></ha-svg-icon>`
+                      : this.hass.localize(
+                          "ui.panel.config.automation.editor.ctrl"
+                        )}</span
+                  >
+                  <span>+</span>
+                  <span>X</span>
+                </span>`
+              : nothing}
+          </div>
        </ha-md-menu-item>
        <ha-md-menu-item
          slot="menu-items"
          .clickAction=${this._toggleYamlMode}
          .disabled=${!this.config.uiSupported || !!this._warnings}
        >
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
-          )}
          <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              `ui.panel.config.automation.editor.edit_${!this.yamlMode ? "yaml" : "ui"}`
+            )}
+            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+          </div>
        </ha-md-menu-item>
        <ha-md-divider
          slot="menu-items"
@@ -164,13 +217,16 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .clickAction=${this.config.disable}
          .disabled=${type === "list"}
        >
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
-          )}
          <ha-svg-icon
            slot="start"
            .path=${this.disabled ? mdiPlayCircleOutline : mdiStopCircleOutline}
          ></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              `ui.panel.config.automation.editor.actions.${disabled ? "enable" : "disable"}`
+            )}
+            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+          </div>
        </ha-md-menu-item>
        <ha-md-menu-item
          slot="menu-items"
@@ -178,22 +234,49 @@ export default class HaAutomationSidebarTrigger extends LitElement {
          .disabled=${this.disabled}
          class="warning"
        >
-          ${this.hass.localize(
-            "ui.panel.config.automation.editor.actions.delete"
-          )}
          <ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
+          <div class="overflow-label">
+            ${this.hass.localize(
+              "ui.panel.config.automation.editor.actions.delete"
+            )}
+            ${!this.narrow
+              ? html`<span class="shortcut">
+                  <span
+                    >${isMac
+                      ? html`<ha-svg-icon
+                          slot="start"
+                          .path=${mdiAppleKeyboardCommand}
+                        ></ha-svg-icon>`
+                      : this.hass.localize(
+                          "ui.panel.config.automation.editor.ctrl"
+                        )}</span
+                  >
+                  <span>+</span>
+                  <span
+                    >${this.hass.localize(
+                      "ui.panel.config.automation.editor.del"
+                    )}</span
+                  >
+                </span>`
+              : nothing}
+          </div>
        </ha-md-menu-item>
-        <ha-automation-trigger-editor
-          class="sidebar-editor"
-          .hass=${this.hass}
-          .trigger=${this.config.config}
-          @value-changed=${this._valueChangedSidebar}
-          .uiSupported=${this.config.uiSupported}
-          .showId=${this._requestShowId}
-          .yamlMode=${this.yamlMode}
-          .disabled=${this.disabled}
-          @ui-mode-not-available=${this._handleUiModeNotAvailable}
-        ></ha-automation-trigger-editor>
+        ${keyed(
+          this.sidebarKey,
+          html`<ha-automation-trigger-editor
+            class="sidebar-editor"
+            .hass=${this.hass}
+            .trigger=${this.config.config}
+            @value-changed=${this._valueChangedSidebar}
+            @yaml-changed=${this._yamlChangedSidebar}
+            .uiSupported=${this.config.uiSupported}
+            .showId=${this._requestShowId}
+            .yamlMode=${this.yamlMode}
+            .disabled=${this.disabled}
+            @ui-mode-not-available=${this._handleUiModeNotAvailable}
+            sidebar
+          ></ha-automation-trigger-editor>`
+        )}
      </ha-automation-sidebar-card>
    `;
  }
@@ -220,6 +303,12 @@ export default class HaAutomationSidebarTrigger extends LitElement {
    }
  }

+  private _yamlChangedSidebar(ev: CustomEvent) {
+    ev.stopPropagation();
+
+    this.config?.save?.(ev.detail.value);
+  }
+
  private _toggleYamlMode = () => {
    fireEvent(this, "toggle-yaml-mode");
  };
--- a/src/panels/config/automation/styles.ts
+++ b/src/panels/config/automation/styles.ts
@@ -37,12 +37,6 @@ export const rowStyles = css`
  ha-tooltip {
    cursor: default;
  }
-  :host([highlight]) ha-card {
-    --shadow-default: var(--ha-card-box-shadow, 0 0 0 0 transparent);
-    --shadow-focus: 0 0 0 1px var(--state-inactive-color);
-    border-color: var(--state-inactive-color);
-    box-shadow: var(--shadow-default), var(--shadow-focus);
-  }
  .hidden {
    display: none;
  }
@@ -54,7 +48,7 @@ export const editorStyles = css`
    pointer-events: none;
  }

-  .card-content {
+  .card-content.card {
    padding: 16px;
  }
  .card-content.yaml {
@@ -69,7 +63,7 @@ export const indentStyle = css`
  .selector-row,
  :host([indent]) ha-form {
    margin-left: 12px;
-    padding: 12px 24px 16px 16px;
+    padding: 12px 0 16px 16px;
    border-left: 2px solid var(--ha-color-border-neutral-quiet);
    border-bottom: 2px solid var(--ha-color-border-neutral-quiet);
    border-radius: 0;
@@ -108,78 +102,59 @@ export const saveFabStyles = css`
 export const manualEditorStyles = css`
  :host {
    display: block;
+    --sidebar-width: 0;
+    --sidebar-gap: 0;
  }

-  .split-view {
+  .has-sidebar {
+    --sidebar-width: min(35vw, 500px);
+    --sidebar-gap: 16px;
+  }
+
+  .fab-positioner {
    display: flex;
-    flex-direction: row;
-    height: 100%;
-    position: relative;
-    gap: 16px;
+    justify-content: flex-end;
  }

-  .split-view.sidebar-hidden {
-    gap: 0;
+  .fab-positioner ha-fab {
+    position: fixed;
+    right: unset;
+    left: unset;
+    bottom: calc(-80px - var(--safe-area-inset-bottom));
+    transition: bottom 0.3s;
+  }
+  .fab-positioner ha-fab.dirty {
+    bottom: 16px;
  }

  .content-wrapper {
-    position: relative;
-    flex: 6;
+    padding-right: calc(var(--sidebar-width) + var(--sidebar-gap));
+    padding-inline-end: calc(var(--sidebar-width) + var(--sidebar-gap));
+    padding-inline-start: 0;
  }

  .content {
-    padding: 32px 16px 64px 0;
-    height: calc(100vh - 153px);
-    height: calc(100dvh - 153px);
-    overflow-y: auto;
-    overflow-x: hidden;
+    padding-top: 24px;
+    padding-bottom: 72px;
  }

-  .sidebar {
-    padding: 12px 0;
-    flex: 4;
-    height: calc(100vh - 81px);
-    height: calc(100dvh - 81px);
-    width: 40%;
-  }
-  .split-view.sidebar-hidden .sidebar {
-    border-color: transparent;
-    border-width: 0;
-    overflow: hidden;
-    flex: 0;
-    visibility: hidden;
-  }
-
-  .sidebar.overlay {
+  ha-automation-sidebar {
    position: fixed;
-    bottom: 8px;
-    right: 8px;
-    height: calc(100% - 70px);
-    padding: 0;
-    z-index: 5;
-    box-shadow: -8px 0 16px rgba(0, 0, 0, 0.2);
+    top: calc(var(--header-height) + 16px);
+    height: calc(-81px + 100dvh);
+    width: var(--sidebar-width);
+    display: block;
  }

-  .sidebar.overlay.rtl {
-    right: unset;
-    left: 8px;
+  ha-automation-sidebar.hidden {
+    display: none;
  }

-  @media all and (max-width: 870px) {
-    .split-view {
-      gap: 0;
-      margin-right: -8px;
-    }
-    .sidebar {
-      height: 0;
-      width: 0;
-      flex: 0;
-    }
+  .sidebar-positioner {
+    display: flex;
+    justify-content: flex-end;
  }

-  .split-view.sidebar-hidden .sidebar.overlay {
-    width: 0;
-  }
  .description {
    margin: 0;
  }
@@ -190,13 +165,13 @@ export const manualEditorStyles = css`

 export const automationRowsStyles = css`
  .rows {
-    padding: 16px 0 16px 16px;
-    margin: -16px;
-    margin-right: -20px;
    display: flex;
    flex-direction: column;
    gap: 16px;
  }
+  .rows.no-sidebar {
+    margin-right: 0;
+  }
  .sortable-ghost {
    background: none;
    border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
@@ -209,9 +184,19 @@ export const automationRowsStyles = css`
    scroll-margin-top: 48px;
  }
  .handle {
-    padding: 12px;
+    margin: 4px;
+    padding: 8px;
    cursor: move; /* fallback if grab cursor is unsupported */
    cursor: grab;
+    border-radius: var(--ha-border-radius-pill);
+  }
+  .handle:focus {
+    outline: var(--wa-focus-ring);
+    background: var(--ha-color-fill-neutral-quiet-resting);
+  }
+  .handle.active {
+    outline: var(--wa-focus-ring);
+    background: var(--ha-color-fill-neutral-normal-active);
  }
  .handle ha-svg-icon {
    pointer-events: none;
@@ -233,4 +218,34 @@ export const sidebarEditorStyles = css`
  .description {
    padding-top: 16px;
  }
+  .overflow-label {
+    display: flex;
+    justify-content: space-between;
+    gap: 12px;
+    white-space: nowrap;
+  }
+  .overflow-label .shortcut {
+    --mdc-icon-size: 12px;
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 2px;
+  }
+  .overflow-label .shortcut span {
+    font-size: var(--ha-font-size-s);
+    font-family: var(--ha-font-family-code);
+    color: var(--ha-color-text-secondary);
+  }
+  .shortcut-placeholder {
+    display: inline-block;
+    width: 60px;
+  }
+  .shortcut-placeholder.mac {
+    width: 46px;
+  }
+  @media all and (max-width: 870px) {
+    .shortcut-placeholder {
+      display: none;
+    }
+  }
 `;
--- a/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-editor.ts
@@ -29,6 +29,8 @@ export default class HaAutomationTriggerEditor extends LitElement {

  @property({ type: Boolean, attribute: "show-id" }) public showId = false;

+  @property({ type: Boolean, attribute: "sidebar" }) public inSidebar = false;
+
  @query("ha-yaml-editor") public yamlEditor?: HaYamlEditor;

  protected render() {
@@ -47,6 +49,7 @@ export default class HaAutomationTriggerEditor extends LitElement {
              this.trigger.enabled === false &&
              !this.yamlMode),
          yaml: yamlMode,
+          card: !this.inSidebar,
        })}
      >
        ${yamlMode
@@ -118,7 +121,7 @@ export default class HaAutomationTriggerEditor extends LitElement {
    if (!ev.detail.isValid) {
      return;
    }
-    fireEvent(this, "value-changed", {
+    fireEvent(this, "yaml-changed", {
      value: migrateAutomationTrigger(ev.detail.value),
    });
  }
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -4,12 +4,12 @@ import {
  mdiArrowUp,
  mdiContentCopy,
  mdiContentCut,
-  mdiContentDuplicate,
  mdiDelete,
  mdiDotsVertical,
  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiStopCircleOutline,
 } from "@mdi/js";
@@ -28,6 +28,7 @@ import { handleStructError } from "../../../../common/structs/handle-errors";
 import { debounce } from "../../../../common/util/debounce";
 import "../../../../components/ha-alert";
 import "../../../../components/ha-automation-row";
+import type { HaAutomationRow } from "../../../../components/ha-automation-row";
 import "../../../../components/ha-card";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
@@ -51,6 +52,7 @@ import {
  showPromptDialog,
 } from "../../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../../types";
+import { showToast } from "../../../../util/toast";
 import "../ha-automation-editor-warning";
 import { rowStyles } from "../styles";
 import "./ha-automation-trigger-editor";
@@ -73,6 +75,7 @@ import "./types/ha-automation-trigger-time";
 import "./types/ha-automation-trigger-time_pattern";
 import "./types/ha-automation-trigger-webhook";
 import "./types/ha-automation-trigger-zone";
+import { copyToClipboard } from "../../../../common/util/copy-clipboard";

 export interface TriggerElement extends LitElement {
  trigger: Trigger;
@@ -112,9 +115,14 @@ export default class HaAutomationTriggerRow extends LitElement {

  @property({ type: Boolean }) public last?: boolean;

+  @property({ type: Boolean }) public highlight?: boolean;
+
  @property({ type: Boolean, attribute: "sidebar" })
  public optionsInSidebar = false;

+  @property({ type: Boolean, attribute: "sort-selected" })
+  public sortSelected = false;
+
  @state() private _yamlMode = false;

  @state() private _triggered?: Record<string, unknown>;
@@ -132,6 +140,9 @@ export default class HaAutomationTriggerRow extends LitElement {
  @query("ha-automation-trigger-editor")
  public triggerEditor?: HaAutomationTriggerEditor;

+  @query("ha-automation-row")
+  private _automationRowElement?: HaAutomationRow;
+
  @storage({
    key: "automationClipboard",
    state: false,
@@ -144,6 +155,10 @@ export default class HaAutomationTriggerRow extends LitElement {
  @consume({ context: fullEntitiesContext, subscribe: true })
  _entityReg!: EntityRegistryEntry[];

+  get selected() {
+    return this._selected;
+  }
+
  private _triggerUnsub?: Promise<UnsubscribeFunc>;

  private _renderRow() {
@@ -165,145 +180,142 @@ export default class HaAutomationTriggerRow extends LitElement {

      <slot name="icons" slot="icons"></slot>

-      <ha-md-button-menu
-        slot="icons"
-        @click=${preventDefaultStopPropagation}
-        @keydown=${stopPropagation}
-        @closed=${stopPropagation}
-        positioning="fixed"
-      >
-        <ha-icon-button
-          slot="trigger"
-          .label=${this.hass.localize("ui.common.menu")}
-          .path=${mdiDotsVertical}
-        ></ha-icon-button>
+      ${!this.optionsInSidebar
+        ? html`<ha-md-button-menu
+            quick
+            slot="icons"
+            @click=${preventDefaultStopPropagation}
+            @keydown=${stopPropagation}
+            @closed=${stopPropagation}
+            positioning="fixed"
+            anchor-corner="end-end"
+            menu-corner="start-end"
+          >
+            <ha-icon-button
+              slot="trigger"
+              .label=${this.hass.localize("ui.common.menu")}
+              .path=${mdiDotsVertical}
+            ></ha-icon-button>
+            <ha-md-menu-item
+              .clickAction=${this._renameTrigger}
+              .disabled=${this.disabled || type === "list"}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.rename"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
+            </ha-md-menu-item>

-        ${!this.optionsInSidebar
-          ? html`<ha-md-menu-item
-                .clickAction=${this._renameTrigger}
-                .disabled=${this.disabled || type === "list"}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.rename"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiRenameBox}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._showTriggerId}
+              .disabled=${this.disabled || type === "list"}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.edit_id"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._showTriggerId}
-                .disabled=${this.disabled || type === "list"}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.edit_id"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiIdentifier}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>

-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
+            <ha-md-menu-item
+              .clickAction=${this._duplicateTrigger}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.duplicate"
+              )}
+              <ha-svg-icon
+                slot="start"
+                .path=${mdiPlusCircleMultipleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._duplicateTrigger}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.duplicate"
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiContentDuplicate}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._copyTrigger}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.copy"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._copyTrigger}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.copy"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCopy}></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._cutTrigger}
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.triggers.cut"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
+            </ha-md-menu-item>

-              <ha-md-menu-item
-                .clickAction=${this._cutTrigger}
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.cut"
-                )}
-                <ha-svg-icon slot="start" .path=${mdiContentCut}></ha-svg-icon>
-              </ha-md-menu-item>`
-          : nothing}
+            <ha-md-menu-item
+              .clickAction=${this._moveUp}
+              .disabled=${this.disabled || this.first}
+            >
+              ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
+              <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
+            ></ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveUp}
-          .disabled=${this.disabled || this.first}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_up")}
-          <ha-svg-icon slot="start" .path=${mdiArrowUp}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._moveDown}
+              .disabled=${this.disabled || this.last}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.move_down"
+              )}
+              <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
+            ></ha-md-menu-item>

-        <ha-md-menu-item
-          .clickAction=${this._moveDown}
-          .disabled=${this.disabled || this.last}
-        >
-          ${this.hass.localize("ui.panel.config.automation.editor.move_down")}
-          <ha-svg-icon slot="start" .path=${mdiArrowDown}></ha-svg-icon
-        ></ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._toggleYamlMode}
+              .disabled=${!supported || !!this._warnings}
+            >
+              ${this.hass.localize(
+                `ui.panel.config.automation.editor.edit_${!yamlMode ? "yaml" : "ui"}`
+              )}
+              <ha-svg-icon slot="start" .path=${mdiPlaylistEdit}></ha-svg-icon>
+            </ha-md-menu-item>

-        ${!this.optionsInSidebar
-          ? html`
-              <ha-md-menu-item
-                .clickAction=${this._toggleYamlMode}
-                .disabled=${!supported || !!this._warnings}
-              >
-                ${this.hass.localize(
-                  `ui.panel.config.automation.editor.edit_${!yamlMode ? "yaml" : "ui"}`
-                )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${mdiPlaylistEdit}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
+            <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>

-              <ha-md-divider role="separator" tabindex="-1"></ha-md-divider>
-
-              <ha-md-menu-item
-                .clickAction=${this._onDisable}
-                .disabled=${this.disabled || type === "list"}
-              >
-                ${"enabled" in this.trigger && this.trigger.enabled === false
-                  ? this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.enable"
-                    )
-                  : this.hass.localize(
-                      "ui.panel.config.automation.editor.actions.disable"
-                    )}
-                <ha-svg-icon
-                  slot="start"
-                  .path=${"enabled" in this.trigger &&
-                  this.trigger.enabled === false
-                    ? mdiPlayCircleOutline
-                    : mdiStopCircleOutline}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
-              <ha-md-menu-item
-                .clickAction=${this._onDelete}
+            <ha-md-menu-item
+              .clickAction=${this._onDisable}
+              .disabled=${this.disabled || type === "list"}
+            >
+              ${"enabled" in this.trigger && this.trigger.enabled === false
+                ? this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.enable"
+                  )
+                : this.hass.localize(
+                    "ui.panel.config.automation.editor.actions.disable"
+                  )}
+              <ha-svg-icon
+                slot="start"
+                .path=${"enabled" in this.trigger &&
+                this.trigger.enabled === false
+                  ? mdiPlayCircleOutline
+                  : mdiStopCircleOutline}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+            <ha-md-menu-item
+              .clickAction=${this._onDelete}
+              class="warning"
+              .disabled=${this.disabled}
+            >
+              ${this.hass.localize(
+                "ui.panel.config.automation.editor.actions.delete"
+              )}
+              <ha-svg-icon
                class="warning"
-                .disabled=${this.disabled}
-              >
-                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.actions.delete"
-                )}
-                <ha-svg-icon
-                  class="warning"
-                  slot="start"
-                  .path=${mdiDelete}
-                ></ha-svg-icon>
-              </ha-md-menu-item>
-            `
-          : nothing}
-      </ha-md-button-menu>
+                slot="start"
+                .path=${mdiDelete}
+              ></ha-svg-icon>
+            </ha-md-menu-item>
+          </ha-md-button-menu>`
+        : nothing}
      ${!this.optionsInSidebar
        ? html`${this._warnings
              ? html`<ha-automation-editor-warning
@@ -343,8 +355,13 @@ export default class HaAutomationTriggerRow extends LitElement {
          ? html`<ha-automation-row
              .disabled=${"enabled" in this.trigger &&
              this.trigger.enabled === false}
-              @click=${this._toggleSidebar}
              .selected=${this._selected}
+              .highlight=${this.highlight}
+              .sortSelected=${this.sortSelected}
+              @click=${this._toggleSidebar}
+              @copy-row=${this._copyTrigger}
+              @cut-row=${this._cutTrigger}
+              @delete-row=${this._onDelete}
              >${this._selected
                ? "selected"
                : nothing}${this._renderRow()}</ha-automation-row
@@ -477,16 +494,19 @@ export default class HaAutomationTriggerRow extends LitElement {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
      },
-      close: () => {
+      close: (focus?: boolean) => {
        this._selected = false;
        fireEvent(this, "close-sidebar");
+        if (focus) {
+          this.focus();
+        }
      },
      rename: () => {
        this._renameTrigger();
      },
      toggleYamlMode: () => {
        this._toggleYamlMode();
-        return this._yamlMode;
+        this.openSidebar();
      },
      disable: this._onDisable,
      delete: this._onDelete,
@@ -500,9 +520,11 @@ export default class HaAutomationTriggerRow extends LitElement {
    this._selected = true;

    if (this.narrow) {
-      this.scrollIntoView({
-        block: "start",
-        behavior: "smooth",
+      requestAnimationFrame(() => {
+        this.scrollIntoView({
+          block: "start",
+          behavior: "smooth",
+        });
      });
    }
  }
@@ -512,6 +534,7 @@ export default class HaAutomationTriggerRow extends LitElement {
      ...this._clipboard,
      trigger: this.trigger,
    };
+    copyToClipboard(JSON.stringify(this.trigger));
  }

  private _onDelete = () => {
@@ -621,6 +644,12 @@ export default class HaAutomationTriggerRow extends LitElement {

  private _copyTrigger = () => {
    this._setClipboard();
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.triggers.copied_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _cutTrigger = () => {
@@ -629,6 +658,12 @@ export default class HaAutomationTriggerRow extends LitElement {
    if (this._selected) {
      fireEvent(this, "close-sidebar");
    }
+    showToast(this, {
+      message: this.hass.localize(
+        "ui.panel.config.automation.editor.triggers.cut_to_clipboard"
+      ),
+      duration: 2000,
+    });
  };

  private _moveUp = () => {
@@ -666,6 +701,10 @@ export default class HaAutomationTriggerRow extends LitElement {
      customElements.get(`ha-automation-trigger-${type}`) !== undefined
  );

+  public focus() {
+    this._automationRowElement?.focus();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      rowStyles,
--- a/src/panels/config/automation/trigger/ha-automation-trigger.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger.ts
@@ -1,12 +1,11 @@
 import { mdiDrag, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
 import type { PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
+import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { storage } from "../../../../common/decorators/storage";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { listenMediaQuery } from "../../../../common/dom/media_query";
 import { nextRender } from "../../../../common/util/render-status";
 import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
@@ -44,7 +43,7 @@ export default class HaAutomationTrigger extends LitElement {

  @property({ type: Boolean }) public root = false;

-  @state() private _showReorder = false;
+  @state() private _rowSortSelected?: number;

  @state()
  @storage({
@@ -57,36 +56,23 @@ export default class HaAutomationTrigger extends LitElement {

  private _focusLastTriggerOnChange = false;

+  private _focusTriggerIndexOnChange?: number;
+
  private _triggerKeys = new WeakMap<Trigger, string>();

-  private _unsubMql?: () => void;
-
-  public connectedCallback() {
-    super.connectedCallback();
-    this._unsubMql = listenMediaQuery("(min-width: 600px)", (matches) => {
-      this._showReorder = matches;
-    });
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubMql?.();
-    this._unsubMql = undefined;
-  }
-
  protected render() {
    return html`
      <ha-sortable
        handle-selector=".handle"
        draggable-selector="ha-automation-trigger-row"
-        .disabled=${!this._showReorder || this.disabled}
+        .disabled=${this.disabled}
        group="triggers"
        invert-swap
        @item-moved=${this._triggerMoved}
        @item-added=${this._triggerAdded}
        @item-removed=${this._triggerRemoved}
      >
-        <div class="rows">
+        <div class="rows ${!this.optionsInSidebar ? "no-sidebar" : ""}">
          ${repeat(
            this.triggers,
            (trigger) => this._getKey(trigger),
@@ -104,12 +90,22 @@ export default class HaAutomationTrigger extends LitElement {
                .hass=${this.hass}
                .disabled=${this.disabled}
                .narrow=${this.narrow}
-                ?highlight=${this.highlightedTriggers?.includes(trg)}
+                .highlight=${this.highlightedTriggers?.includes(trg)}
                .optionsInSidebar=${this.optionsInSidebar}
+                .sortSelected=${this._rowSortSelected === idx}
+                @stop-sort-selection=${this._stopSortSelection}
              >
-                ${this._showReorder && !this.disabled
+                ${!this.disabled
                  ? html`
-                      <div class="handle" slot="icons">
+                      <div
+                        tabindex="0"
+                        class="handle ${this._rowSortSelected === idx
+                          ? "active"
+                          : ""}"
+                        slot="icons"
+                        @keydown=${this._handleDragKeydown}
+                        .index=${idx}
+                      >
                        <ha-svg-icon .path=${mdiDrag}></ha-svg-icon>
                      </div>
                    `
@@ -172,12 +168,18 @@ export default class HaAutomationTrigger extends LitElement {
  protected updated(changedProps: PropertyValues) {
    super.updated(changedProps);

-    if (changedProps.has("triggers") && this._focusLastTriggerOnChange) {
-      this._focusLastTriggerOnChange = false;
-
+    if (
+      changedProps.has("triggers") &&
+      (this._focusLastTriggerOnChange ||
+        this._focusTriggerIndexOnChange !== undefined)
+    ) {
      const row = this.shadowRoot!.querySelector<HaAutomationTriggerRow>(
-        "ha-automation-trigger-row:last-of-type"
+        `ha-automation-trigger-row:${this._focusLastTriggerOnChange ? "last-of-type" : `nth-of-type(${this._focusTriggerIndexOnChange! + 1})`}`
      )!;
+
+      this._focusLastTriggerOnChange = false;
+      this._focusTriggerIndexOnChange = undefined;
+
      row.updateComplete.then(() => {
        if (this.optionsInSidebar) {
          row.openSidebar();
@@ -189,8 +191,8 @@ export default class HaAutomationTrigger extends LitElement {
          }
        } else {
          row.expand();
+          row.focus();
        }
-        row.focus();
      });
    }
  }
@@ -216,15 +218,27 @@ export default class HaAutomationTrigger extends LitElement {
  private _moveUp(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index - 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationTriggerRow).first) {
+      const newIndex = index - 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _moveDown(ev) {
    ev.stopPropagation();
    const index = (ev.target as any).index;
-    const newIndex = index + 1;
-    this._move(index, newIndex);
+    if (!(ev.target as HaAutomationTriggerRow).last) {
+      const newIndex = index + 1;
+      this._move(index, newIndex);
+      if (this._rowSortSelected === index) {
+        this._rowSortSelected = newIndex;
+      }
+      ev.target.focus();
+    }
  }

  private _move(oldIndex: number, newIndex: number) {
@@ -244,6 +258,9 @@ export default class HaAutomationTrigger extends LitElement {
  private async _triggerAdded(ev: CustomEvent): Promise<void> {
    ev.stopPropagation();
    const { index, data } = ev.detail;
+    const item = ev.detail.item as HaAutomationTriggerRow;
+    const selected = item.selected;
+
    let triggers = [
      ...this.triggers.slice(0, index),
      data,
@@ -251,6 +268,9 @@ export default class HaAutomationTrigger extends LitElement {
    ];
    // Add trigger locally to avoid UI jump
    this.triggers = triggers;
+    if (selected) {
+      this._focusTriggerIndexOnChange = triggers.length === 1 ? 0 : index;
+    }
    await nextRender();
    if (this.triggers !== triggers) {
      // Ensure trigger is added even after update
@@ -259,6 +279,9 @@ export default class HaAutomationTrigger extends LitElement {
        data,
        ...this.triggers.slice(index),
      ];
+      if (selected) {
+        this._focusTriggerIndexOnChange = triggers.length === 1 ? 0 : index;
+      }
    }
    fireEvent(this, "value-changed", { value: triggers });
  }
@@ -302,14 +325,21 @@ export default class HaAutomationTrigger extends LitElement {
    });
  }

-  static styles = [
-    automationRowsStyles,
-    css`
-      :host([root]) .rows {
-        padding-right: 8px;
-      }
-    `,
-  ];
+  private _handleDragKeydown(ev: KeyboardEvent) {
+    if (ev.key === "Enter" || ev.key === " ") {
+      ev.stopPropagation();
+      this._rowSortSelected =
+        this._rowSortSelected === undefined
+          ? (ev.target as any).index
+          : undefined;
+    }
+  }
+
+  private _stopSortSelection() {
+    this._rowSortSelected = undefined;
+  }
+
+  static styles = automationRowsStyles;
 }

 declare global {
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-tag.ts
@@ -42,6 +42,8 @@ export class HaTagTrigger extends LitElement implements TriggerElement {
        .disabled=${this.disabled || this._tags.length === 0}
        .value=${this.trigger.tag_id}
        @selected=${this._tagChanged}
+        fixedMenuPosition
+        naturalMenuWidth
      >
        ${this._tags.map(
          (tag) => html`
--- a/src/panels/config/dashboard/dialog-new-dashboard.ts
+++ b/src/panels/config/dashboard/dialog-new-dashboard.ts
@@ -49,8 +49,8 @@ const STRATEGIES = [
  {
    type: "home",
    images: {
-      light: "/static/images/dashboard-options/light/icon-dashboard-areas.svg",
-      dark: "/static/images/dashboard-options/dark/icon-dashboard-areas.svg",
+      light: "/static/images/dashboard-options/light/icon-dashboard-home.svg",
+      dark: "/static/images/dashboard-options/dark/icon-dashboard-home.svg",
    },
    name: "ui.panel.config.lovelace.dashboards.dialog_new.strategy.home.title",
    description:
--- a/src/panels/config/network/ha-config-network.ts
+++ b/src/panels/config/network/ha-config-network.ts
@@ -23,10 +23,7 @@ class ConfigNetwork extends LitElement {
  @state() private _error?: { code: string; message: string };

  protected render() {
-    if (
-      !this.hass.userData?.showAdvanced ||
-      !isComponentLoaded(this.hass, "network")
-    ) {
+    if (!isComponentLoaded(this.hass, "network")) {
      return nothing;
    }

--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -1,7 +1,6 @@
 import { consume } from "@lit/context";
 import {
  mdiCog,
-  mdiContentDuplicate,
  mdiContentSave,
  mdiDebugStepOver,
  mdiDelete,
@@ -11,6 +10,7 @@ import {
  mdiInformationOutline,
  mdiPlay,
  mdiPlaylistEdit,
+  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
  mdiRobotConfused,
  mdiTag,
@@ -308,7 +308,7 @@ export class HaScriptEditor extends SubscribeMixin(
            )}
            <ha-svg-icon
              slot="graphic"
-              .path=${mdiContentDuplicate}
+              .path=${mdiPlusCircleMultipleOutline}
            ></ha-svg-icon>
          </ha-list-item>

@@ -384,60 +384,6 @@ export class HaScriptEditor extends SubscribeMixin(
          </ha-list-item>
        </ha-button-menu>
        <div class=${this._mode === "yaml" ? "yaml-mode" : ""}>
-          <div class="error-wrapper">
-            ${this._errors || stateObj?.state === UNAVAILABLE
-              ? html`<ha-alert
-                  alert-type="error"
-                  .title=${stateObj?.state === UNAVAILABLE
-                    ? this.hass.localize(
-                        "ui.panel.config.script.editor.unavailable"
-                      )
-                    : undefined}
-                >
-                  ${this._errors || this._validationErrors}
-                  ${stateObj?.state === UNAVAILABLE
-                    ? html`<ha-svg-icon
-                        slot="icon"
-                        .path=${mdiRobotConfused}
-                      ></ha-svg-icon>`
-                    : nothing}
-                </ha-alert>`
-              : nothing}
-            ${this._blueprintConfig
-              ? html`<ha-alert alert-type="info">
-                  ${this.hass.localize(
-                    "ui.panel.config.script.editor.confirm_take_control"
-                  )}
-                  <div slot="action" style="display: flex;">
-                    <ha-button
-                      appearance="plain"
-                      @click=${this._takeControlSave}
-                      >${this.hass.localize("ui.common.yes")}</ha-button
-                    >
-                    <ha-button
-                      appearance="plain"
-                      @click=${this._revertBlueprint}
-                      >${this.hass.localize("ui.common.no")}</ha-button
-                    >
-                  </div>
-                </ha-alert>`
-              : this._readOnly
-                ? html`<ha-alert alert-type="warning" dismissable
-                    >${this.hass.localize(
-                      "ui.panel.config.script.editor.read_only"
-                    )}
-                    <ha-button
-                      appearance="plain"
-                      slot="action"
-                      @click=${this._duplicate}
-                    >
-                      ${this.hass.localize(
-                        "ui.panel.config.script.editor.migrate"
-                      )}
-                    </ha-button>
-                  </ha-alert>`
-                : nothing}
-          </div>
          ${this._mode === "gui"
            ? html`
                <div>
@@ -467,7 +413,68 @@ export class HaScriptEditor extends SubscribeMixin(
                          @value-changed=${this._valueChanged}
                          @editor-save=${this._handleSaveScript}
                          @save-script=${this._handleSaveScript}
-                        ></manual-script-editor>
+                        >
+                          <div class="alert-wrapper" slot="alerts">
+                            ${this._errors || stateObj?.state === UNAVAILABLE
+                              ? html`<ha-alert
+                                  alert-type="error"
+                                  .title=${stateObj?.state === UNAVAILABLE
+                                    ? this.hass.localize(
+                                        "ui.panel.config.script.editor.unavailable"
+                                      )
+                                    : undefined}
+                                >
+                                  ${this._errors || this._validationErrors}
+                                  ${stateObj?.state === UNAVAILABLE
+                                    ? html`<ha-svg-icon
+                                        slot="icon"
+                                        .path=${mdiRobotConfused}
+                                      ></ha-svg-icon>`
+                                    : nothing}
+                                </ha-alert>`
+                              : nothing}
+                            ${this._blueprintConfig
+                              ? html`<ha-alert alert-type="info">
+                                  ${this.hass.localize(
+                                    "ui.panel.config.script.editor.confirm_take_control"
+                                  )}
+                                  <div slot="action" style="display: flex;">
+                                    <ha-button
+                                      appearance="plain"
+                                      @click=${this._takeControlSave}
+                                      >${this.hass.localize(
+                                        "ui.common.yes"
+                                      )}</ha-button
+                                    >
+                                    <ha-button
+                                      appearance="plain"
+                                      @click=${this._revertBlueprint}
+                                      >${this.hass.localize(
+                                        "ui.common.no"
+                                      )}</ha-button
+                                    >
+                                  </div>
+                                </ha-alert>`
+                              : this._readOnly
+                                ? html`<ha-alert
+                                    alert-type="warning"
+                                    dismissable
+                                    >${this.hass.localize(
+                                      "ui.panel.config.script.editor.read_only"
+                                    )}
+                                    <ha-button
+                                      appearance="plain"
+                                      slot="action"
+                                      @click=${this._duplicate}
+                                    >
+                                      ${this.hass.localize(
+                                        "ui.panel.config.script.editor.migrate"
+                                      )}
+                                    </ha-button>
+                                  </ha-alert>`
+                                : nothing}
+                          </div>
+                        </manual-script-editor>
                      `}
                </div>
              `
@@ -1040,6 +1047,9 @@ export class HaScriptEditor extends SubscribeMixin(
  protected supportedShortcuts(): SupportedShortcuts {
    return {
      s: () => this._handleSaveScript(),
+      c: () => this._copySelectedRow(),
+      x: () => this._cutSelectedRow(),
+      Delete: () => this._deleteSelectedRow(),
    };
  }

@@ -1059,6 +1069,18 @@ export class HaScriptEditor extends SubscribeMixin(
    this._manualEditor?.expandAll();
  }

+  private _copySelectedRow() {
+    this._manualEditor?.copySelectedRow();
+  }
+
+  private _cutSelectedRow() {
+    this._manualEditor?.cutSelectedRow();
+  }
+
+  private _deleteSelectedRow() {
+    this._manualEditor?.deleteSelectedRow();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -1092,6 +1114,28 @@ export class HaScriptEditor extends SubscribeMixin(
          border-radius: var(--ha-border-radius-sm);
        }

+        .alert-wrapper {
+          position: sticky;
+          top: -24px;
+          margin-top: -24px;
+          margin-bottom: 8px;
+          z-index: 1;
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          gap: 8px;
+          pointer-events: none;
+        }
+
+        .alert-wrapper ha-alert {
+          background-color: var(--card-background-color);
+          box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+          border-radius: var(--ha-border-radius-sm);
+          margin-bottom: 0;
+          pointer-events: auto;
+        }
+
        manual-script-editor {
          max-width: 1540px;
          padding: 0 12px;
--- a/src/panels/config/script/ha-script-field-editor.ts
+++ b/src/panels/config/script/ha-script-field-editor.ts
@@ -152,7 +152,12 @@ export default class HaScriptFieldEditor extends LitElement {
    ev.stopPropagation();
    const value = { ...ev.detail.value };

-    if (typeof value !== "object" || Object.keys(value).length !== 1) {
+    if (
+      typeof value !== "object" ||
+      Object.keys(value).length !== 1 ||
+      !value[Object.keys(value)[0]] ||
+      !value[Object.keys(value)[0]].selector
+    ) {
      this._yamlError = "yaml_error";
      return;
    }
@@ -165,7 +170,7 @@ export default class HaScriptFieldEditor extends LitElement {

    const newValue = { ...value[key], key };

-    fireEvent(this, "value-changed", { value: newValue });
+    fireEvent(this, "yaml-changed", { value: newValue });
  }

  private _computeLabelCallback = (
--- a/src/panels/config/script/ha-script-field-row.ts
+++ b/src/panels/config/script/ha-script-field-row.ts
@@ -5,10 +5,8 @@ import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../common/translations/localize";
 import "../../../components/ha-automation-row";
+import type { HaAutomationRow } from "../../../components/ha-automation-row";
 import "../../../components/ha-card";
-import "../../../components/ha-icon-button";
-import "../../../components/ha-md-button-menu";
-import "../../../components/ha-md-menu-item";
 import type { ScriptFieldSidebarConfig } from "../../../data/automation";
 import type { Field } from "../../../data/script";
 import { SELECTOR_SELECTOR_BUILDING_BLOCKS } from "../../../data/selector/selector_selector";
@@ -34,6 +32,8 @@ export default class HaScriptFieldRow extends LitElement {

  @property({ type: Boolean }) public narrow = false;

+  @property({ type: Boolean }) public highlight?: boolean;
+
  @state() private _yamlMode = false;

  @state() private _selected = false;
@@ -47,6 +47,12 @@ export default class HaScriptFieldRow extends LitElement {
  @query("ha-script-field-selector-editor")
  private _selectorEditor?: HaScriptFieldSelectorEditor;

+  @query("ha-automation-row:first-of-type")
+  private _fieldRowElement?: HaAutomationRow;
+
+  @query(".selector-row ha-automation-row")
+  private _selectorRowElement?: HaAutomationRow;
+
  protected render() {
    return html`
      <ha-card outlined>
@@ -57,6 +63,8 @@ export default class HaScriptFieldRow extends LitElement {
          left-chevron
          @toggle-collapsed=${this._toggleCollapse}
          .collapsed=${this._collapsed}
+          .highlight=${this.highlight}
+          @delete-row=${this._onDelete}
        >
          <h3 slot="header">${this.key}</h3>

@@ -79,6 +87,7 @@ export default class HaScriptFieldRow extends LitElement {
            .leftChevron=${SELECTOR_SELECTOR_BUILDING_BLOCKS.includes(
              Object.keys(this.field.selector)[0]
            )}
+            .highlight=${this.highlight}
          >
            <h3 slot="header">
              ${this.hass.localize(
@@ -198,17 +207,23 @@ export default class HaScriptFieldRow extends LitElement {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
      },
-      close: () => {
+      close: (focus?: boolean) => {
        if (selectorEditor) {
          this._selectorRowSelected = false;
+          if (focus) {
+            this.focusSelector();
+          }
        } else {
          this._selected = false;
+          if (focus) {
+            this.focus();
+          }
        }
        fireEvent(this, "close-sidebar");
      },
      toggleYamlMode: () => {
        this._toggleYamlMode();
-        return this._yamlMode;
+        this.openSidebar();
      },
      delete: this._onDelete,
      config: {
@@ -221,9 +236,11 @@ export default class HaScriptFieldRow extends LitElement {
    } satisfies ScriptFieldSidebarConfig);

    if (this.narrow) {
-      this.scrollIntoView({
-        block: "start",
-        behavior: "smooth",
+      requestAnimationFrame(() => {
+        this.scrollIntoView({
+          block: "start",
+          behavior: "smooth",
+        });
      });
    }
  }
@@ -252,15 +269,19 @@ export default class HaScriptFieldRow extends LitElement {
    });
  };

+  public focus() {
+    this._fieldRowElement?.focus();
+  }
+
+  public focusSelector() {
+    this._selectorRowElement?.focus();
+  }
+
  static get styles(): CSSResultGroup {
    return [
      haStyle,
      indentStyle,
      css`
-        ha-button-menu,
-        ha-icon-button {
-          --mdc-theme-text-primary-on-background: var(--primary-text-color);
-        }
        .disabled {
          opacity: 0.5;
          pointer-events: none;
@@ -306,9 +327,6 @@ export default class HaScriptFieldRow extends LitElement {
          );
        }

-        ha-md-menu-item[disabled] {
-          --mdc-theme-text-primary-on-background: var(--disabled-text-color);
-        }
        .warning ul {
          margin: 4px 0;
        }
@@ -318,11 +336,8 @@ export default class HaScriptFieldRow extends LitElement {
        li[role="separator"] {
          border-bottom-color: var(--divider-color);
        }
-        :host([highlight]) ha-card {
-          --shadow-default: var(--ha-card-box-shadow, 0 0 0 0 transparent);
-          --shadow-focus: 0 0 0 1px var(--state-inactive-color);
-          border-color: var(--state-inactive-color);
-          box-shadow: var(--shadow-default), var(--shadow-focus);
+        .selector-row {
+          padding: 12px 0 16px 16px;
        }
      `,
    ];
--- a/src/panels/config/script/ha-script-field-selector-editor.ts
+++ b/src/panels/config/script/ha-script-field-selector-editor.ts
@@ -132,7 +132,7 @@ export default class HaScriptFieldSelectorEditor extends LitElement {
      return;
    }

-    fireEvent(this, "value-changed", { value });
+    fireEvent(this, "yaml-changed", { value });
  }

  private _computeLabelCallback = (
--- a/src/panels/config/script/ha-script-fields.ts
+++ b/src/panels/config/script/ha-script-fields.ts
@@ -43,7 +43,7 @@ export default class HaScriptFields extends LitElement {
                  .disabled=${this.disabled}
                  @value-changed=${this._fieldChanged}
                  .hass=${this.hass}
-                  ?highlight=${this.highlightedFields?.[key] !== undefined}
+                  .highlight=${this.highlightedFields?.[key] !== undefined}
                  .narrow=${this.narrow}
                >
                </ha-script-field-row>
--- a/src/panels/config/script/manual-script-editor.ts
+++ b/src/panels/config/script/manual-script-editor.ts
@@ -2,7 +2,13 @@ import { mdiContentSave, mdiHelpCircle } from "@mdi/js";
 import { load } from "js-yaml";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import {
+  customElement,
+  property,
+  query,
+  queryAll,
+  state,
+} from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import {
  any,
@@ -22,10 +28,12 @@ import {
  extractSearchParam,
  removeSearchParam,
 } from "../../../common/url/search-params";
-import { computeRTL } from "../../../common/util/compute_rtl";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-markdown";
-import type { SidebarConfig } from "../../../data/automation";
+import type {
+  ActionSidebarConfig,
+  SidebarConfig,
+} from "../../../data/automation";
 import type { Action, Fields, ScriptConfig } from "../../../data/script";
 import {
  getActionType,
@@ -38,6 +46,7 @@ import { showToast } from "../../../util/toast";
 import "../automation/action/ha-automation-action";
 import type HaAutomationAction from "../automation/action/ha-automation-action";
 import "../automation/ha-automation-sidebar";
+import type HaAutomationSidebar from "../automation/ha-automation-sidebar";
 import { showPasteReplaceDialog } from "../automation/paste-replace-dialog/show-dialog-paste-replace";
 import { manualEditorStyles, saveFabStyles } from "../automation/styles";
 import "./ha-script-fields";
@@ -69,17 +78,26 @@ export class HaManualScriptEditor extends LitElement {

  @property({ attribute: false }) public dirty = false;

-  @query("ha-script-fields")
-  private _scriptFields?: HaScriptFields;
-
-  private _openFields = false;
-
  @state() private _pastedConfig?: ScriptConfig;

  @state() private _sidebarConfig?: SidebarConfig;

+  @state() private _sidebarKey?: string;
+
+  @query("ha-script-fields")
+  private _scriptFields?: HaScriptFields;
+
+  @query("ha-automation-sidebar") private _sidebarElement?: HaAutomationSidebar;
+
+  @queryAll("ha-automation-action, ha-script-fields")
+  private _collapsableElements?: NodeListOf<
+    HaAutomationAction | HaScriptFields
+  >;
+
  private _previousConfig?: ScriptConfig;

+  private _openFields = false;
+
  public addFields() {
    this._openFields = true;
    fireEvent(this, "value-changed", {
@@ -196,36 +214,42 @@ export class HaManualScriptEditor extends LitElement {
    return html`
      <div
        class=${classMap({
-          "split-view": true,
-          "sidebar-hidden": !this._sidebarConfig,
+          "has-sidebar": this._sidebarConfig && !this.narrow,
        })}
      >
        <div class="content-wrapper">
-          <div class="content">${this._renderContent()}</div>
-          <ha-fab
-            slot="fab"
-            class=${this.dirty ? "dirty" : ""}
-            .label=${this.hass.localize("ui.common.save")}
-            .disabled=${this.saving}
-            extended
-            @click=${this._saveScript}
-          >
-            <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
-          </ha-fab>
+          <div class="content">
+            <slot name="alerts"></slot>
+            ${this._renderContent()}
+          </div>
+          <div class="fab-positioner">
+            <div class="fab-positioner">
+              <ha-fab
+                slot="fab"
+                class=${this.dirty ? "dirty" : ""}
+                .label=${this.hass.localize("ui.common.save")}
+                .disabled=${this.saving}
+                extended
+                @click=${this._saveScript}
+              >
+                <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
+              </ha-fab>
+            </div>
+          </div>
+        </div>
+        <div class="sidebar-positioner">
+          <ha-automation-sidebar
+            .sidebarKey=${this._sidebarKey}
+            tabindex="-1"
+            class=${classMap({ hidden: !this._sidebarConfig })}
+            .narrow=${this.narrow}
+            .isWide=${this.isWide}
+            .hass=${this.hass}
+            .config=${this._sidebarConfig}
+            @value-changed=${this._sidebarConfigChanged}
+            .disabled=${this.disabled}
+          ></ha-automation-sidebar>
        </div>
-        <ha-automation-sidebar
-          class=${classMap({
-            sidebar: true,
-            overlay: !this.isWide,
-            rtl: computeRTL(this.hass),
-          })}
-          .narrow=${this.narrow}
-          .isWide=${this.isWide}
-          .hass=${this.hass}
-          .config=${this._sidebarConfig}
-          @value-changed=${this._sidebarConfigChanged}
-          .disabled=${this.disabled}
-        ></ha-automation-sidebar>
      </div>
    `;
  }
@@ -347,7 +371,11 @@ export class HaManualScriptEditor extends LitElement {
    if (normalized) {
      ev.preventDefault();

-      if (this.dirty) {
+      if (
+        this.dirty ||
+        ensureArray(this.config.sequence)?.length ||
+        Object.keys(this.config.fields || {}).length
+      ) {
        const result = await new Promise<boolean>((resolve) => {
          showPasteReplaceDialog(this, {
            domain: "script",
@@ -452,10 +480,14 @@ export class HaManualScriptEditor extends LitElement {
    });
  }

-  private _openSidebar(ev: CustomEvent<SidebarConfig>) {
+  private async _openSidebar(ev: CustomEvent<SidebarConfig>) {
    // deselect previous selected row
    this._sidebarConfig?.close?.();
    this._sidebarConfig = ev.detail;
+    this._sidebarKey = JSON.stringify(this._sidebarConfig);
+
+    await this._sidebarElement?.updateComplete;
+    this._sidebarElement?.focus();
  }

  private _sidebarConfigChanged(ev: CustomEvent<{ value: SidebarConfig }>) {
@@ -487,24 +519,36 @@ export class HaManualScriptEditor extends LitElement {
    fireEvent(this, "save-script");
  }

-  private _getCollapsableElements() {
-    return this.shadowRoot!.querySelectorAll<
-      HaAutomationAction | HaScriptFields
-    >("ha-automation-action, ha-script-fields");
-  }
-
  public expandAll() {
-    this._getCollapsableElements().forEach((element) => {
+    this._collapsableElements?.forEach((element) => {
      element.expandAll();
    });
  }

  public collapseAll() {
-    this._getCollapsableElements().forEach((element) => {
+    this._collapsableElements?.forEach((element) => {
      element.collapseAll();
    });
  }

+  public copySelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.copy) {
+      (this._sidebarConfig as ActionSidebarConfig).copy();
+    }
+  }
+
+  public cutSelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.cut) {
+      (this._sidebarConfig as ActionSidebarConfig).cut();
+    }
+  }
+
+  public deleteSelectedRow() {
+    if ((this._sidebarConfig as ActionSidebarConfig)?.delete) {
+      (this._sidebarConfig as ActionSidebarConfig).delete();
+    }
+  }
+
  static get styles(): CSSResultGroup {
    return [
      saveFabStyles,
@@ -522,6 +566,10 @@ export class HaManualScriptEditor extends LitElement {
          font-weight: var(--ha-font-weight-normal);
          flex: 1;
        }
+
+        .description {
+          margin-top: 16px;
+        }
      `,
    ];
  }
--- a/src/panels/config/storage/ha-config-section-storage.ts
+++ b/src/panels/config/storage/ha-config-section-storage.ts
@@ -327,8 +327,7 @@ class HaConfigSectionStorage extends LitElement {
            >${roundWithOneDecimal(freeSpaceGB)} GB</span
          >`,
      });
-      const chart = html`
-        <ha-segmented-bar
+      return html`<ha-segmented-bar
          .heading=${this.hass.localize("ui.panel.config.storage.used_space")}
          .description=${this.hass.localize(
            "ui.panel.config.storage.detailed_description",
@@ -339,17 +338,15 @@ class HaConfigSectionStorage extends LitElement {
          )}
          .segments=${segments}
        ></ha-segmented-bar>
-      `;
-      return storageInfo || storageInfo === null
-        ? chart
-        : html`
-            <div class="loading-container">
-              ${chart}
-              <div class="loading-overlay">
-                <ha-spinner></ha-spinner>
-              </div>
-            </div>
-          `;
+
+        ${!storageInfo || storageInfo === null
+          ? html`<ha-alert alert-type="info">
+              <ha-spinner slot="icon"></ha-spinner>
+              ${this.hass.localize(
+                "ui.panel.config.storage.loading_detailed"
+              )}</ha-alert
+            >`
+          : nothing}`;
    }
  );

@@ -522,6 +519,10 @@ class HaConfigSectionStorage extends LitElement {
    ha-icon-next {
      width: 24px;
    }
+
+    ha-alert ha-spinner {
+      --ha-spinner-size: 24px;
+    }
  `;
 }

--- a/src/panels/lovelace/card-features/hui-history-chart-card-feature.ts
+++ b/src/panels/lovelace/card-features/hui-history-chart-card-feature.ts
@@ -19,7 +19,6 @@ import type {
 import { getSensorNumericDeviceClasses } from "../../../data/sensor";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
-import { getGraphColorByIndex } from "../../../common/color/colors";
 import { computeTimelineColor } from "../../../components/chart/timeline-color";
 import { downSampleLineData } from "../../../components/chart/down-sample";
 import { fireEvent } from "../../../common/dom/fire_event";
@@ -93,20 +92,19 @@ class HuiHistoryChartCardFeature
    const width = this.clientWidth;
    const height = this.clientHeight;
    if (line) {
-      const points = this._generateLinePoints(line);
-      const { paths, filledPaths } = this._getLinePaths(points);
-      const color = getGraphColorByIndex(0, this.style);
+      const { points, yAxisOrigin } = this._generateLinePoints(line);
+      const { paths, filledPaths } = this._getLinePaths(points, yAxisOrigin);

      return html`
        <div class="line" @click=${this._handleClick}>
          ${svg`<svg width="${width}" height="${height}" viewBox="0 0 ${width} ${height}">
            ${paths.map(
              (path) =>
-                svg`<path d="${path}" stroke="${color}" stroke-width="1" stroke-linecap="round" fill="none" />`
+                svg`<path d="${path}" stroke="var(--feature-color)" stroke-width="1" stroke-linecap="round" fill="none" />`
            )}
            ${filledPaths.map(
              (path) =>
-                svg`<path d="${path}" stroke="none" stroke-linecap="round" fill="${color}" fill-opacity="0.2" />`
+                svg`<path d="${path}" stroke="none" stroke-linecap="round" fill="var(--feature-color)" fill-opacity="0.2" />`
            )}
              </svg>`}
        </div>
@@ -161,9 +159,13 @@ class HuiHistoryChartCardFeature
    );
  }

-  private _generateLinePoints(line: LineChartUnit): { x: number; y: number }[] {
+  private _generateLinePoints(line: LineChartUnit): {
+    points: { x: number; y: number }[];
+    yAxisOrigin: number;
+  } {
    const width = this.clientWidth;
    const height = this.clientHeight;
+    let yAxisOrigin = height;
    let minY = Number(line.data[0].states[0].state);
    let maxY = Number(line.data[0].states[0].state);
    const minX = line.data[0].states[0].last_changed;
@@ -172,8 +174,7 @@ class HuiHistoryChartCardFeature
      const stateValue = Number(stateData.state);
      if (stateValue < minY) {
        minY = stateValue;
-      }
-      if (stateValue > maxY) {
+      } else if (stateValue > maxY) {
        maxY = stateValue;
      }
    });
@@ -187,9 +188,21 @@ class HuiHistoryChartCardFeature
      minX,
      maxX
    );
-    // add margin to the min and max
-    minY -= rangeY * 0.1;
-    maxY += rangeY * 0.1;
+    if (maxY < 0) {
+      // all values are negative
+      // add margin
+      maxY += rangeY * 0.1;
+      maxY = Math.min(0, maxY);
+      yAxisOrigin = 0;
+    } else if (minY < 0) {
+      // some values are negative
+      yAxisOrigin = (maxY / (maxY - minY || 1)) * height;
+    } else {
+      // all values are positive
+      // add margin
+      minY -= rangeY * 0.1;
+      minY = Math.max(0, minY);
+    }
    const yDenom = maxY - minY || 1;
    const xDenom = maxX - minX || 1;
    const points = sampledData!.map((point) => {
@@ -198,7 +211,7 @@ class HuiHistoryChartCardFeature
      return { x, y };
    });
    points.push({ x: width, y: points[points.length - 1].y });
-    return points;
+    return { points, yAxisOrigin };
  }

  private _generateTimelineRanges(timeline: TimelineEntity) {
@@ -234,7 +247,10 @@ class HuiHistoryChartCardFeature
    return ranges;
  }

-  private _getLinePaths(points: { x: number; y: number }[]) {
+  private _getLinePaths(
+    points: { x: number; y: number }[],
+    yAxisOrigin: number
+  ) {
    const paths: string[] = [];
    const filledPaths: string[] = [];
    if (!points.length) {
@@ -269,7 +285,7 @@ class HuiHistoryChartCardFeature
      paths.push(path);
      filledPaths.push(
        path +
-          ` L ${next!.x},${this.clientHeight} L ${pathPoints[0].x},${this.clientHeight} Z`
+          ` L ${next!.x},${yAxisOrigin} L ${pathPoints[0].x},${yAxisOrigin} Z`
      );
    });

--- a/src/panels/lovelace/card-features/types.ts
+++ b/src/panels/lovelace/card-features/types.ts
@@ -239,6 +239,7 @@ export type LovelaceCardFeatureConfig =
  | FanOscillateCardFeatureConfig
  | FanPresetModesCardFeatureConfig
  | FanSpeedCardFeatureConfig
+  | HistoryChartCardFeatureConfig
  | HumidifierToggleCardFeatureConfig
  | HumidifierModesCardFeatureConfig
  | LawnMowerCommandsCardFeatureConfig
--- a/src/panels/lovelace/cards/hui-heading-card.ts
+++ b/src/panels/lovelace/cards/hui-heading-card.ts
@@ -138,6 +138,7 @@ export class HuiHeadingCard extends LitElement implements LovelaceCard {
      flex-direction: column;
      justify-content: flex-end;
      height: 100%;
+      min-height: 24px;
    }
    [role="button"] {
      cursor: pointer;
@@ -147,7 +148,7 @@ export class HuiHeadingCard extends LitElement implements LovelaceCard {
      transition: transform 180ms ease-in-out;
    }
    .container {
-      padding: 2px 4px;
+      padding: 0 4px;
      display: flex;
      flex-direction: row;
      justify-content: space-between;
--- a/src/panels/lovelace/cards/hui-home-summary-card.ts
+++ b/src/panels/lovelace/cards/hui-home-summary-card.ts
@@ -0,0 +1,372 @@
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import { ifDefined } from "lit/directives/if-defined";
+import { styleMap } from "lit/directives/style-map";
+import { computeCssColor } from "../../../common/color/compute-color";
+import { computeDomain } from "../../../common/entity/compute_domain";
+import { generateEntityFilter } from "../../../common/entity/entity_filter";
+import { formatNumber } from "../../../common/number/format_number";
+import "../../../components/ha-card";
+import "../../../components/ha-icon";
+import "../../../components/ha-ripple";
+import "../../../components/tile/ha-tile-icon";
+import "../../../components/tile/ha-tile-info";
+import type { ActionHandlerEvent } from "../../../data/lovelace/action_handler";
+import "../../../state-display/state-display";
+import type { HomeAssistant } from "../../../types";
+import { actionHandler } from "../common/directives/action-handler-directive";
+import { handleAction } from "../common/handle-action";
+import { hasAction } from "../common/has-action";
+import {
+  findEntities,
+  getSummaryLabel,
+  HOME_SUMMARIES_FILTERS,
+  HOME_SUMMARIES_ICONS,
+  type HomeSummary,
+} from "../strategies/home/helpers/home-summaries";
+import type { LovelaceCard, LovelaceGridOptions } from "../types";
+import type { HomeSummaryCard } from "./types";
+
+const COLORS: Record<HomeSummary, string> = {
+  lights: "amber",
+  climate: "deep-orange",
+  security: "blue",
+  media_players: "purple",
+};
+
+@customElement("hui-home-summary-card")
+export class HuiHomeSummaryCard extends LitElement implements LovelaceCard {
+  @property({ attribute: false }) public hass?: HomeAssistant;
+
+  @state() private _config?: HomeSummaryCard;
+
+  public setConfig(config: HomeSummaryCard): void {
+    this._config = config;
+  }
+
+  public getCardSize(): number {
+    return this._config?.vertical ? 2 : 1;
+  }
+
+  public getGridOptions(): LovelaceGridOptions {
+    const columns = 6;
+    let min_columns = 6;
+    let rows = 1;
+
+    if (this._config?.vertical) {
+      rows++;
+      min_columns = 3;
+    }
+    return {
+      columns,
+      rows,
+      min_columns,
+      min_rows: rows,
+    };
+  }
+
+  private _handleAction(ev: ActionHandlerEvent) {
+    handleAction(this, this.hass!, this._config!, ev.detail.action!);
+  }
+
+  private get _hasCardAction() {
+    return (
+      hasAction(this._config?.tap_action) ||
+      hasAction(this._config?.hold_action) ||
+      hasAction(this._config?.double_tap_action)
+    );
+  }
+
+  private _computeSummaryState(): string {
+    if (!this._config || !this.hass) {
+      return "";
+    }
+    const allEntities = Object.keys(this.hass!.states);
+
+    const areas = Object.values(this.hass.areas);
+    const areasFilter = generateEntityFilter(this.hass, {
+      area: areas.map((area) => area.area_id),
+    });
+
+    const entitiesInsideArea = allEntities.filter(areasFilter);
+
+    switch (this._config.summary) {
+      case "lights": {
+        // Number of lights on
+        const lightsFilters = HOME_SUMMARIES_FILTERS.lights.map((filter) =>
+          generateEntityFilter(this.hass!, filter)
+        );
+
+        const lightEntities = findEntities(entitiesInsideArea, lightsFilters);
+
+        const onLights = lightEntities.filter((entityId) => {
+          const s = this.hass!.states[entityId]?.state;
+          return s === "on";
+        });
+
+        return onLights.length
+          ? this.hass.localize("ui.card.home-summary.count_lights_on", {
+              count: onLights.length,
+            })
+          : this.hass.localize("ui.card.home-summary.all_lights_off");
+      }
+      case "climate": {
+        // Min/Max temperature of the areas
+        const areaSensors = areas
+          .map((area) => area.temperature_entity_id)
+          .filter(Boolean);
+
+        const sensorsValues = areaSensors
+          .map(
+            (entityId) => parseFloat(this.hass!.states[entityId!].state) || NaN
+          )
+          .filter((value) => !isNaN(value));
+
+        if (sensorsValues.length === 0) {
+          return "";
+        }
+        const minTemp = Math.min(...sensorsValues);
+        const maxTemp = Math.max(...sensorsValues);
+
+        if (isNaN(minTemp) || isNaN(maxTemp)) {
+          return "";
+        }
+
+        const formattedMinTemp = formatNumber(minTemp, this.hass?.locale, {
+          minimumFractionDigits: 1,
+          maximumFractionDigits: 1,
+        });
+        const formattedMaxTemp = formatNumber(maxTemp, this.hass?.locale, {
+          minimumFractionDigits: 1,
+          maximumFractionDigits: 1,
+        });
+        return formattedMinTemp === formattedMaxTemp
+          ? `${formattedMinTemp}°`
+          : `${formattedMinTemp} - ${formattedMaxTemp}°`;
+      }
+      case "security": {
+        // Alarm and lock status
+        const securityFilters = HOME_SUMMARIES_FILTERS.security.map((filter) =>
+          generateEntityFilter(this.hass!, filter)
+        );
+
+        const securityEntities = findEntities(
+          entitiesInsideArea,
+          securityFilters
+        );
+
+        const locks = securityEntities.filter((entityId) => {
+          const domain = computeDomain(entityId);
+          return domain === "lock";
+        });
+
+        const alarms = securityEntities.filter((entityId) => {
+          const domain = computeDomain(entityId);
+          return domain === "alarm_control_panel";
+        });
+
+        const disarmedAlarms = alarms.filter((entityId) => {
+          const s = this.hass!.states[entityId]?.state;
+          return s === "disarmed";
+        });
+
+        if (!locks.length && !alarms.length) {
+          return "";
+        }
+
+        const unlockedLocks = locks.filter((entityId) => {
+          const s = this.hass!.states[entityId]?.state;
+          return s === "unlocked" || s === "jammed" || s === "open";
+        });
+
+        if (unlockedLocks.length) {
+          return this.hass.localize(
+            "ui.card.home-summary.count_locks_unlocked",
+            {
+              count: unlockedLocks.length,
+            }
+          );
+        }
+        if (disarmedAlarms.length) {
+          return this.hass.localize(
+            "ui.card.home-summary.count_alarms_disarmed",
+            {
+              count: disarmedAlarms.length,
+            }
+          );
+        }
+        return this.hass.localize("ui.card.home-summary.all_secure");
+      }
+      case "media_players": {
+        // Playing media
+        const mediaPlayerFilters = HOME_SUMMARIES_FILTERS.media_players.map(
+          (filter) => generateEntityFilter(this.hass!, filter)
+        );
+
+        const mediaPlayerEntities = findEntities(
+          entitiesInsideArea,
+          mediaPlayerFilters
+        );
+
+        const playingMedia = mediaPlayerEntities.filter((entityId) => {
+          const s = this.hass!.states[entityId]?.state;
+          return s === "playing";
+        });
+
+        return playingMedia.length
+          ? this.hass.localize("ui.card.home-summary.count_media_playing", {
+              count: playingMedia.length,
+            })
+          : this.hass.localize("ui.card.home-summary.no_media_playing");
+      }
+    }
+    return "";
+  }
+
+  protected render() {
+    if (!this._config || !this.hass) {
+      return nothing;
+    }
+
+    const contentClasses = { vertical: Boolean(this._config.vertical) };
+
+    const color = computeCssColor(COLORS[this._config.summary]);
+
+    const style = {
+      "--tile-color": color,
+    };
+
+    const secondary = this._computeSummaryState();
+
+    const label = getSummaryLabel(this.hass.localize, this._config.summary);
+    const icon = HOME_SUMMARIES_ICONS[this._config.summary];
+
+    return html`
+      <ha-card style=${styleMap(style)}>
+        <div
+          class="background"
+          @action=${this._handleAction}
+          .actionHandler=${actionHandler({
+            hasHold: hasAction(this._config!.hold_action),
+            hasDoubleClick: hasAction(this._config!.double_tap_action),
+          })}
+          role=${ifDefined(this._hasCardAction ? "button" : undefined)}
+          tabindex=${ifDefined(this._hasCardAction ? "0" : undefined)}
+          aria-labelledby="info"
+        >
+          <ha-ripple .disabled=${!this._hasCardAction}></ha-ripple>
+        </div>
+        <div class="container">
+          <div class="content ${classMap(contentClasses)}">
+            <ha-tile-icon>
+              <ha-icon slot="icon" .icon=${icon}></ha-icon>
+            </ha-tile-icon>
+            <ha-tile-info
+              id="info"
+              .primary=${label}
+              .secondary=${secondary}
+            ></ha-tile-info>
+          </div>
+        </div>
+      </ha-card>
+    `;
+  }
+
+  static styles = css`
+    :host {
+      --tile-color: var(--state-inactive-color);
+      -webkit-tap-highlight-color: transparent;
+    }
+    ha-card:has(.background:focus-visible) {
+      --shadow-default: var(--ha-card-box-shadow, 0 0 0 0 transparent);
+      --shadow-focus: 0 0 0 1px var(--tile-color);
+      border-color: var(--tile-color);
+      box-shadow: var(--shadow-default), var(--shadow-focus);
+    }
+    ha-card {
+      --ha-ripple-color: var(--tile-color);
+      --ha-ripple-hover-opacity: 0.04;
+      --ha-ripple-pressed-opacity: 0.12;
+      height: 100%;
+      transition:
+        box-shadow 180ms ease-in-out,
+        border-color 180ms ease-in-out;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+    ha-card.active {
+      --tile-color: var(--state-icon-color);
+    }
+    [role="button"] {
+      cursor: pointer;
+      pointer-events: auto;
+    }
+    [role="button"]:focus {
+      outline: none;
+    }
+    .background {
+      position: absolute;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+      border-radius: var(--ha-card-border-radius, 12px);
+      margin: calc(-1 * var(--ha-card-border-width, 1px));
+      overflow: hidden;
+    }
+    .container {
+      margin: calc(-1 * var(--ha-card-border-width, 1px));
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+    }
+    .container.horizontal {
+      flex-direction: row;
+    }
+
+    .content {
+      position: relative;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      padding: 10px;
+      flex: 1;
+      min-width: 0;
+      box-sizing: border-box;
+      pointer-events: none;
+      gap: 10px;
+    }
+
+    .vertical {
+      flex-direction: column;
+      text-align: center;
+      justify-content: center;
+    }
+    .vertical ha-tile-info {
+      width: 100%;
+      flex: none;
+    }
+
+    ha-tile-icon {
+      --tile-icon-color: var(--tile-color);
+      position: relative;
+      padding: 6px;
+      margin: -6px;
+    }
+
+    ha-tile-info {
+      position: relative;
+      min-width: 0;
+      transition: background-color 180ms ease-in-out;
+      box-sizing: border-box;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-home-summary-card": HuiHomeSummaryCard;
+  }
+}
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -26,6 +26,7 @@ import type {
 import type { LovelaceHeaderFooterConfig } from "../header-footer/types";
 import type { LovelaceHeadingBadgeConfig } from "../heading-badges/types";
 import type { TimeFormat } from "../../../data/translation";
+import type { HomeSummary } from "../strategies/home/helpers/home-summaries";

 export type AlarmPanelCardConfigState =
  | "arm_away"
@@ -588,3 +589,11 @@ export interface HeadingCardConfig extends LovelaceCardConfig {
  /** @deprecated Use `badges` instead */
  entities?: LovelaceHeadingBadgeConfig[];
 }
+
+export interface HomeSummaryCard extends LovelaceCardConfig {
+  summary: HomeSummary;
+  vertical?: boolean;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
+  double_tap_action?: ActionConfig;
+}
--- a/src/panels/lovelace/create-element/create-card-element.ts
+++ b/src/panels/lovelace/create-element/create-card-element.ts
@@ -68,6 +68,7 @@ const LAZY_LOAD_TYPES = {
  "energy-sankey": () => import("../cards/energy/hui-energy-sankey-card"),
  "entity-filter": () => import("../cards/hui-entity-filter-card"),
  error: () => import("../cards/hui-error-card"),
+  "home-summary": () => import("../cards/hui-home-summary-card"),
  gauge: () => import("../cards/hui-gauge-card"),
  "history-graph": () => import("../cards/hui-history-graph-card"),
  "horizontal-stack": () => import("../cards/hui-horizontal-stack-card"),
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -355,7 +355,10 @@ class HUIRoot extends LitElement {
      overflowItems.forEach((i) => {
        const title = [this.hass!.localize(i.key), i.suffix].join(" ");
        const action = i.subItems
-          ? () => {
+          ? (e) => {
+              if (!shouldHandleRequestSelectedEvent(e)) {
+                return;
+              }
              showListItemsDialog(this, {
                title: title,
                items: i.subItems!.map((si) => ({
--- a/src/panels/lovelace/strategies/home/editor/hui-home-dashboard-strategy-editor.ts
+++ b/src/panels/lovelace/strategies/home/editor/hui-home-dashboard-strategy-editor.ts
@@ -29,8 +29,12 @@ export class HuiHomeDashboardStrategyEditor
      <ha-entities-picker
        .hass=${this.hass}
        .value=${this._config.favorite_entities || []}
-        label="Favorite entities"
-        placeholder="Add favorite entity"
+        label=${this.hass.localize(
+          "ui.panel.lovelace.editor.strategy.home.favorite_entities"
+        )}
+        placeholder=${this.hass.localize(
+          "ui.panel.lovelace.editor.strategy.home.add_favorite_entity"
+        )}
        reorder
        allow-custom-entity
        @value-changed=${this._valueChanged}
--- a/src/panels/lovelace/strategies/home/helpers/home-summaries.ts
+++ b/src/panels/lovelace/strategies/home/helpers/home-summaries.ts
@@ -2,6 +2,7 @@ import type {
  EntityFilter,
  EntityFilterFunc,
 } from "../../../../../common/entity/entity_filter";
+import type { LocalizeFunc } from "../../../../../common/translations/localize";

 export const HOME_SUMMARIES = [
  "lights",
@@ -10,16 +11,16 @@ export const HOME_SUMMARIES = [
  "media_players",
 ] as const;

-export type HomeSummaries = (typeof HOME_SUMMARIES)[number];
+export type HomeSummary = (typeof HOME_SUMMARIES)[number];

-export const HOME_SUMMARIES_ICONS: Record<HomeSummaries, string> = {
+export const HOME_SUMMARIES_ICONS: Record<HomeSummary, string> = {
  lights: "mdi:lamps",
  climate: "mdi:home-thermometer",
  security: "mdi:security",
  media_players: "mdi:multimedia",
 };

-export const HOME_SUMMARIES_FILTERS: Record<HomeSummaries, EntityFilter[]> = {
+export const HOME_SUMMARIES_FILTERS: Record<HomeSummary, EntityFilter[]> = {
  lights: [{ domain: "light", entity_category: "none" }],
  climate: [
    { domain: "climate", entity_category: "none" },
@@ -65,7 +66,7 @@ export const HOME_SUMMARIES_FILTERS: Record<HomeSummaries, EntityFilter[]> = {
    },
    {
      domain: "binary_sensor",
-      device_class: ["door", "garage_door"],
+      device_class: ["door", "garage_door", "motion"],
      entity_category: "none",
    },
  ],
@@ -90,3 +91,6 @@ export const findEntities = (

  return results;
 };
+
+export const getSummaryLabel = (localize: LocalizeFunc, summary: HomeSummary) =>
+  localize(`ui.panel.lovelace.strategy.home.summary_list.${summary}`);
--- a/src/panels/lovelace/strategies/home/home-area-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-area-view-strategy.ts
@@ -14,10 +14,11 @@ import type { HeadingCardConfig } from "../../cards/types";
 import { computeAreaTileCardConfig } from "../areas/helpers/areas-strategy-helper";
 import {
  findEntities,
+  getSummaryLabel,
  HOME_SUMMARIES,
  HOME_SUMMARIES_FILTERS,
  HOME_SUMMARIES_ICONS,
-  type HomeSummaries,
+  type HomeSummary,
 } from "./helpers/home-summaries";

 export interface HomeAreaViewStrategyConfig {
@@ -96,7 +97,7 @@ export class HomeAreaViewStrategy extends ReactiveElement {
        acc[summary] = findEntities(areaEntities, filterFunctions);
        return acc;
      },
-      {} as Record<HomeSummaries, string[]>
+      {} as Record<HomeSummary, string[]>
    );

    const {
@@ -110,7 +111,11 @@ export class HomeAreaViewStrategy extends ReactiveElement {
      sections.push({
        type: "grid",
        cards: [
-          computeHeadingCard("Lights", HOME_SUMMARIES_ICONS.lights, "lights"),
+          computeHeadingCard(
+            getSummaryLabel(hass.localize, "lights"),
+            HOME_SUMMARIES_ICONS.lights,
+            "lights"
+          ),
          ...lights.map(computeTileCard),
        ],
      });
@@ -121,7 +126,7 @@ export class HomeAreaViewStrategy extends ReactiveElement {
        type: "grid",
        cards: [
          computeHeadingCard(
-            "Climate",
+            getSummaryLabel(hass.localize, "climate"),
            HOME_SUMMARIES_ICONS.climate,
            "climate"
          ),
@@ -135,7 +140,7 @@ export class HomeAreaViewStrategy extends ReactiveElement {
        type: "grid",
        cards: [
          computeHeadingCard(
-            "Security",
+            getSummaryLabel(hass.localize, "security"),
            HOME_SUMMARIES_ICONS.security,
            "security"
          ),
@@ -149,7 +154,7 @@ export class HomeAreaViewStrategy extends ReactiveElement {
        type: "grid",
        cards: [
          computeHeadingCard(
-            "Media players",
+            getSummaryLabel(hass.localize, "media_players"),
            HOME_SUMMARIES_ICONS.media_players,
            "media-players"
          ),
@@ -229,9 +234,11 @@ export class HomeAreaViewStrategy extends ReactiveElement {
      const device = hass.devices[deviceId];
      let heading = "";
      if (device) {
-        heading = computeDeviceName(device) || "Unnamed device";
+        heading =
+          computeDeviceName(device) ||
+          hass.localize("ui.panel.lovelace.strategy.home.unamed_device");
      } else {
-        heading = "Others";
+        heading = hass.localize("ui.panel.lovelace.strategy.home.others");
      }

      deviceSections.push({
--- a/src/panels/lovelace/strategies/home/home-climate-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-climate-view-strategy.ts
@@ -12,17 +12,37 @@ import {
 } from "../areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "./helpers/home-structure";
 import { findEntities, HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import { computeObjectId } from "../../../../common/entity/compute_object_id";

 export interface HomeClimateViewStrategyConfig {
  type: "home-climate";
 }

+const createTempHumidBadge = (hass: HomeAssistant, entityId: string) => {
+  const stateObj = hass.states[entityId];
+  return {
+    type: "tile",
+    entity: entityId,
+    name: stateObj
+      ? computeStateName(stateObj)
+      : computeObjectId(entityId).replace(/_/g, " "),
+    features: [
+      {
+        type: "history-chart",
+        hours_to_show: 3,
+      },
+    ],
+  };
+};
+
 const processAreasForClimate = (
  areaIds: string[],
  hass: HomeAssistant,
  entities: string[]
 ): LovelaceCardConfig[] => {
  const cards: LovelaceCardConfig[] = [];
+  const computeTileCard = computeAreaTileCardConfig(hass, "", true);

  for (const areaId of areaIds) {
    const area = hass.areas[areaId];
@@ -33,8 +53,6 @@ const processAreasForClimate = (
    });
    const areaEntities = entities.filter(areaFilter);

-    const computeTileCard = computeAreaTileCardConfig(hass, "", true);
-
    if (areaEntities.length > 0) {
      cards.push({
        heading_style: "subtitle",
@@ -46,6 +64,17 @@ const processAreasForClimate = (
        },
      });

+      if (hass.areas[areaId].temperature_entity_id) {
+        cards.push(
+          createTempHumidBadge(hass, hass.areas[areaId].temperature_entity_id)
+        );
+      }
+      if (hass.areas[areaId].humidity_entity_id) {
+        cards.push(
+          createTempHumidBadge(hass, hass.areas[areaId].humidity_entity_id)
+        );
+      }
+
      for (const entityId of areaEntities) {
        cards.push(computeTileCard(entityId));
      }
@@ -89,7 +118,10 @@ export class HomeClimateViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? floor.name : "Areas",
+            heading:
+              floorCount > 1
+                ? floor.name
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
@@ -110,7 +142,10 @@ export class HomeClimateViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? "Other areas" : "Areas",
+            heading:
+              floorCount > 1
+                ? hass.localize("ui.panel.lovelace.strategy.home.other_areas")
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
--- a/src/panels/lovelace/strategies/home/home-dashboard-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-dashboard-strategy.ts
@@ -6,7 +6,10 @@ import type { LovelaceViewRawConfig } from "../../../../data/lovelace/config/vie
 import type { HomeAssistant } from "../../../../types";
 import { getAreas } from "../areas/helpers/areas-strategy-helper";
 import type { LovelaceStrategyEditor } from "../types";
-import { HOME_SUMMARIES_ICONS } from "./helpers/home-summaries";
+import {
+  getSummaryLabel,
+  HOME_SUMMARIES_ICONS,
+} from "./helpers/home-summaries";
 import type { HomeAreaViewStrategyConfig } from "./home-area-view-strategy";
 import type { HomeMainViewStrategyConfig } from "./home-main-view-strategy";

@@ -60,7 +63,7 @@ export class HomeDashboardStrategy extends ReactiveElement {
    });

    const lightView = {
-      title: "Lights",
+      title: getSummaryLabel(hass.localize, "lights"),
      path: "lights",
      subview: true,
      strategy: {
@@ -70,7 +73,7 @@ export class HomeDashboardStrategy extends ReactiveElement {
    } satisfies LovelaceViewRawConfig;

    const climateView = {
-      title: "Climate",
+      title: getSummaryLabel(hass.localize, "climate"),
      path: "climate",
      subview: true,
      strategy: {
@@ -80,7 +83,7 @@ export class HomeDashboardStrategy extends ReactiveElement {
    } satisfies LovelaceViewRawConfig;

    const securityView = {
-      title: "Security",
+      title: getSummaryLabel(hass.localize, "security"),
      path: "security",
      subview: true,
      strategy: {
@@ -90,7 +93,7 @@ export class HomeDashboardStrategy extends ReactiveElement {
    } satisfies LovelaceViewRawConfig;

    const mediaPlayersView = {
-      title: "Media players",
+      title: getSummaryLabel(hass.localize, "media_players"),
      path: "media-players",
      subview: true,
      strategy: {
--- a/src/panels/lovelace/strategies/home/home-lights-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-lights-view-strategy.ts
@@ -89,7 +89,10 @@ export class HomeLightsViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? floor.name : "Areas",
+            heading:
+              floorCount > 1
+                ? floor.name
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
@@ -110,7 +113,10 @@ export class HomeLightsViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? "Other areas" : "Areas",
+            heading:
+              floorCount > 1
+                ? hass.localize("ui.panel.lovelace.strategy.home.other_areas")
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
--- a/src/panels/lovelace/strategies/home/home-main-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-main-view-strategy.ts
@@ -9,13 +9,12 @@ import type { LovelaceViewConfig } from "../../../../data/lovelace/config/view";
 import type { HomeAssistant } from "../../../../types";
 import type {
  AreaCardConfig,
-  ButtonCardConfig,
+  HomeSummaryCard,
  MarkdownCardConfig,
  TileCardConfig,
  WeatherForecastCardConfig,
 } from "../../cards/types";
 import { getAreas } from "../areas/helpers/areas-strategy-helper";
-import { HOME_SUMMARIES_ICONS } from "./helpers/home-summaries";

 export interface HomeMainViewStrategyConfig {
  type: "home-main";
@@ -63,7 +62,7 @@ export class HomeMainViewStrategy extends ReactiveElement {
        {
          type: "heading",
          heading_style: "title",
-          heading: "Areas",
+          heading: hass.localize("ui.panel.lovelace.strategy.home.areas"),
        },
        ...areas.map<AreaCardConfig>((area) =>
          computeAreaCard(area.area_id, hass)
@@ -96,6 +95,7 @@ export class HomeMainViewStrategy extends ReactiveElement {
            ({
              type: "tile",
              entity: entityId,
+              show_entity_picture: true,
            }) as TileCardConfig
        )
      );
@@ -107,64 +107,60 @@ export class HomeMainViewStrategy extends ReactiveElement {
      cards: [
        {
          type: "heading",
-          heading: "Summaries",
+          heading: hass.localize("ui.panel.lovelace.strategy.home.summaries"),
        },
        {
-          type: "button",
-          icon: HOME_SUMMARIES_ICONS.lights,
-          name: "Lights",
-          icon_height: "24px",
-          grid_options: {
-            rows: 2,
-            columns: 4,
-          },
+          type: "home-summary",
+          summary: "lights",
+          vertical: true,
          tap_action: {
            action: "navigate",
            navigation_path: "lights",
          },
-        } satisfies ButtonCardConfig,
-        {
-          type: "button",
-          icon: HOME_SUMMARIES_ICONS.climate,
-          name: "Climate",
-          icon_height: "30px",
          grid_options: {
            rows: 2,
            columns: 4,
          },
+        } satisfies HomeSummaryCard,
+        {
+          type: "home-summary",
+          summary: "climate",
+          vertical: true,
          tap_action: {
            action: "navigate",
            navigation_path: "climate",
          },
-        } satisfies ButtonCardConfig,
-        {
-          type: "button",
-          icon: HOME_SUMMARIES_ICONS.security,
-          name: "Security",
-          icon_height: "30px",
          grid_options: {
            rows: 2,
            columns: 4,
          },
+        } satisfies HomeSummaryCard,
+        {
+          type: "home-summary",
+          summary: "security",
+          vertical: true,
          tap_action: {
            action: "navigate",
            navigation_path: "security",
          },
-        } satisfies ButtonCardConfig,
-        {
-          type: "button",
-          icon: HOME_SUMMARIES_ICONS.media_players,
-          name: "Media Players",
-          icon_height: "30px",
          grid_options: {
            rows: 2,
            columns: 4,
          },
+        } satisfies HomeSummaryCard,
+        {
+          type: "home-summary",
+          summary: "media_players",
+          vertical: true,
          tap_action: {
            action: "navigate",
            navigation_path: "media-players",
          },
-        } satisfies ButtonCardConfig,
+          grid_options: {
+            rows: 2,
+            columns: 4,
+          },
+        } satisfies HomeSummaryCard,
      ],
    };

@@ -211,6 +207,7 @@ export class HomeMainViewStrategy extends ReactiveElement {
            "ui.panel.lovelace.cards.energy.energy_distribution.title_today"
          ),
          type: "energy-distribution",
+          collection_key: "energy_home_dashboard",
          link_dashboard: true,
        });
      }
@@ -231,7 +228,7 @@ export class HomeMainViewStrategy extends ReactiveElement {
        card: {
          type: "markdown",
          text_only: true,
-          content: "## Welcome {{user}}",
+          content: `## ${hass.localize("ui.panel.lovelace.strategy.home.welcome_user", { user: "{{ user }}" })}`,
        } satisfies MarkdownCardConfig,
      },
    };
--- a/src/panels/lovelace/strategies/home/home-media-players-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-media-players-view-strategy.ts
@@ -87,7 +87,10 @@ export class HomeMMediaPlayersViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? floor.name : "Areas",
+            heading:
+              floorCount > 1
+                ? floor.name
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
@@ -108,7 +111,10 @@ export class HomeMMediaPlayersViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? "Other areas" : "Areas",
+            heading:
+              floorCount > 1
+                ? hass.localize("ui.panel.lovelace.strategy.home.other_areas")
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
--- a/src/panels/lovelace/strategies/home/home-security-view-strategy.ts
+++ b/src/panels/lovelace/strategies/home/home-security-view-strategy.ts
@@ -12,6 +12,9 @@ import {
 } from "../areas/helpers/areas-strategy-helper";
 import { getHomeStructure } from "./helpers/home-structure";
 import { findEntities, HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries";
+import { computeDomain } from "../../../../common/entity/compute_domain";
+import { computeStateName } from "../../../../common/entity/compute_state_name";
+import { computeObjectId } from "../../../../common/entity/compute_object_id";

 export interface HomeSecurityViewStrategyConfig {
  type: "home-security";
@@ -23,6 +26,7 @@ const processAreasForSecurity = (
  entities: string[]
 ): LovelaceCardConfig[] => {
  const cards: LovelaceCardConfig[] = [];
+  const computeTileCard = computeAreaTileCardConfig(hass, "", false);

  for (const areaId of areaIds) {
    const area = hass.areas[areaId];
@@ -33,8 +37,6 @@ const processAreasForSecurity = (
    });
    const areaEntities = entities.filter(areaFilter);

-    const computeTileCard = computeAreaTileCardConfig(hass, "", false);
-
    if (areaEntities.length > 0) {
      cards.push({
        heading_style: "subtitle",
@@ -47,7 +49,25 @@ const processAreasForSecurity = (
      });

      for (const entityId of areaEntities) {
-        cards.push(computeTileCard(entityId));
+        const stateObj = hass.states[entityId];
+        cards.push(
+          computeDomain(entityId) === "binary_sensor" &&
+            stateObj?.attributes.device_class === "motion"
+            ? {
+                type: "tile",
+                entity: entityId,
+                name: stateObj
+                  ? computeStateName(stateObj)
+                  : computeObjectId(entityId).replace(/_/g, " "),
+                features: [
+                  {
+                    type: "history-chart",
+                    hours_to_show: 6,
+                  },
+                ],
+              }
+            : computeTileCard(entityId)
+        );
      }
    }
  }
@@ -89,7 +109,10 @@ export class HomeSecurityViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? floor.name : "Areas",
+            heading:
+              floorCount > 1
+                ? floor.name
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
@@ -110,7 +133,10 @@ export class HomeSecurityViewStrategy extends ReactiveElement {
        cards: [
          {
            type: "heading",
-            heading: floorCount > 1 ? "Other areas" : "Areas",
+            heading:
+              floorCount > 1
+                ? hass.localize("ui.panel.lovelace.strategy.home.other_areas")
+                : hass.localize("ui.panel.lovelace.strategy.home.areas"),
          },
        ],
      };
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -201,6 +201,15 @@
        "open_door_confirm": "Really open?",
        "open_door_done": "Done"
      },
+      "home-summary": {
+        "all_lights_off": "All off",
+        "count_lights_on": "{count} {count, plural,\n one {on}\n other {on}\n}",
+        "count_locks_unlocked": "{count} {count, plural,\n one {unlocked}\n other {unlocked}\n}",
+        "count_alarms_disarmed": "{count} {count, plural,\n one {disarmed}\n other {disarmed}\n}",
+        "all_secure": "All secure",
+        "no_media_playing": "No media playing",
+        "count_media_playing": "{count} {count, plural,\n one {playing}\n other {playing}\n}"
+      },
      "media_player": {
        "source": "Source",
        "sound_mode": "Sound mode",
@@ -453,7 +462,7 @@
          "media_content_id": "Media content ID",
          "media_content_type": "Media content type",
          "media_content_id_detail": "The ID of the content to play. Platform dependent.",
-          "media_content_type_detail": "The type of the content to play, such as image, music, tv show, video, episode, channel, or playlist."
+          "media_content_type_detail": "The type of the content to play, such as image, music, TV show, video, episode, channel, or playlist."
        },
        "file": {
          "upload_failed": "Upload failed",
@@ -3847,10 +3856,13 @@
            "type_script_plural": "[%key:ui::panel::config::blueprint::overview::types_plural::script%]",
            "new_automation_setup_failed_title": "New {type} setup failed",
            "new_automation_setup_failed_text": "Your new {type} has saved, but waiting for it to setup has timed out. This could be due to errors parsing your configuration.yaml, please check the configuration in developer tools. Your {type} will not be visible until this is corrected, and {types} are reloaded. Changes to area, category, or labels were not saved and must be reapplied.",
+            "item_pasted": "{item} pasted",
+            "ctrl": "Ctrl",
+            "del": "Del",
            "triggers": {
              "name": "Triggers",
              "header": "When",
-              "description": "A trigger is a specific event happening in or around your home, for example: ''When the sun sets''. Any trigger listed here will start your automation.",
+              "description": "A trigger is a specific event happening in or around your home, for example: ''When the sun sets''. Any trigger added here will start your automation.",
              "learn_more": "Learn more about triggers",
              "triggered": "Triggered",
              "add": "Add trigger",
@@ -3873,6 +3885,8 @@
              "unknown_trigger": "[%key:ui::panel::config::devices::automation::triggers::unknown_trigger%]",
              "triggering_event_detail": "Triggering event detail",
              "trigger": "Trigger",
+              "copied_to_clipboard": "Trigger copied to clipboard",
+              "cut_to_clipboard": "Trigger cut to clipboard",
              "groups": {
                "entity": {
                  "label": "Entity",
@@ -4110,7 +4124,7 @@
            "conditions": {
              "name": "Conditions",
              "header": "And if",
-              "description": "This list of conditions needs to be satisfied for the automation to run. A condition can be satisfied or not at any given time, for example: ''If {user} is home''. You can use building blocks to create more complex conditions.",
+              "description": "All conditions added here need to be satisfied for the automation to run. A condition can be satisfied or not at any given time, for example: ''If {user} is home''. You can use building blocks to create more complex conditions.",
              "learn_more": "Learn more about conditions",
              "add": "Add condition",
              "search": "Search condition",
@@ -4135,6 +4149,8 @@
              "type_select": "Condition type",
              "unknown_condition": "[%key:ui::panel::config::devices::automation::conditions::unknown_condition%]",
              "condition": "Condition",
+              "copied_to_clipboard": "Condition copied to clipboard",
+              "cut_to_clipboard": "Condition cut to clipboard",
              "groups": {
                "entity": {
                  "label": "Entity",
@@ -4277,7 +4293,7 @@
            "actions": {
              "name": "Actions",
              "header": "Then do",
-              "description": "This list of actions will be performed in sequence when the automation runs. An action usually controls one of your areas, devices, or entities, for example: 'Turn on the lights'. You can use building blocks to create more complex sequences of actions.",
+              "description": "All actions added here will be performed in sequence when the automation runs. An action usually controls one of your areas, devices, or entities, for example: 'Turn on the lights'. You can use building blocks to create more complex sequences of actions.",
              "learn_more": "Learn more about actions",
              "add": "Add action",
              "search": "Search action",
@@ -4304,6 +4320,8 @@
              "type_select": "Action type",
              "continue_on_error": "Continue on error",
              "action": "Action",
+              "copied_to_clipboard": "Action copied to clipboard",
+              "cut_to_clipboard": "Action cut to clipboard",
              "groups": {
                "helpers": {
                  "label": "Helpers"
@@ -5447,8 +5465,8 @@
          "config_entry": {
            "application_credentials": {
              "delete_title": "Application credentials",
-              "delete_prompt": "Would you like to also delete Application Credentials for this integration?",
-              "delete_detail": "If you delete them, you will need to enter credentials when setting up the integration again. If you keep them, they will be used automatically when setting up the integration again or may be accessed from the Application Credentials menu.",
+              "delete_prompt": "Would you like to also delete application credentials for this integration?",
+              "delete_detail": "If you delete them, you will need to enter credentials when setting up the integration again. If you keep them, they will be used automatically when setting up the integration again or may be accessed from the Application credentials menu.",
              "delete_error_title": "Deleting application credentials failed",
              "dismiss": "Keep",
              "learn_more": "Learn more about application credentials"
@@ -5647,10 +5665,10 @@
        },
        "application_credentials": {
          "caption": "Application credentials",
-          "description": "Manage the OAuth application credentials used by Integrations",
+          "description": "Manage the OAuth application credentials used by integrations",
          "editor": {
-            "caption": "Add credentials",
-            "description": "OAuth is used to grant Home Assistant access to information on other websites without giving a password. This mechanism is used by companies such as Spotify, Google, Withings, Microsoft, and Twitter.",
+            "caption": "Add application credentials",
+            "description": "OAuth is used to grant Home Assistant secure delegated access to information on other websites without revealing your personal credentials.",
            "missing_credentials": "Setting up {integration} requires configuring application credentials.",
            "missing_credentials_domain_link": "View {integration} documentation",
            "view_documentation": "View application credentials documentation",
@@ -6571,7 +6589,7 @@
            "in_progress": "We're communicating with the device. This may take some time.",
            "failed": "The command failed. Additional information may be available in the logs.",
            "success": "Your device is ready to be added to another Matter platform.",
-            "scan_code": "With their app, scan the QR code or enter the sharing code below to finish set up.",
+            "scan_code": "With their app, scan the QR code or enter the sharing code below to finish setup.",
            "copy_code": "Copy code"
          }
        },
@@ -6664,6 +6682,7 @@
          "ip_information": "IP information",
          "adapter": {
            "auto_configure": "Autoconfigure",
+            "auto_configure_manual_hint": "Uncheck to manually select network adapters",
            "detected": "Detected",
            "adapter": "Adapter"
          }
@@ -6673,6 +6692,7 @@
          "description": "{percent_used} used - {free_space} free",
          "used_space": "Storage",
          "detailed_description": "{used} of {total} used",
+          "loading_detailed": "Loading detailed storage information...",
          "segments": {
            "used": "Used space",
            "free": "Free space",
@@ -6815,6 +6835,20 @@
            },
            "other_areas": "Other areas",
            "areas": "Areas"
+          },
+          "home": {
+            "summary_list": {
+              "climate": "Climate",
+              "lights": "Lights",
+              "security": "Security",
+              "media_players": "Media players"
+            },
+            "welcome_user": "Welcome {user}",
+            "summaries": "Summaries",
+            "areas": "Areas",
+            "other_areas": "Other areas",
+            "unamed_device": "Unnamed device",
+            "others": "Others"
          }
        },
        "cards": {
@@ -8174,6 +8208,10 @@
              "no_entities": "No entities in this group, the section will not be displayed",
              "use_compact_card": "Use compact card",
              "use_large_card": "Use large card"
+            },
+            "home": {
+              "favorite_entities": "Favorite entities",
+              "add_favorite_entity": "Add favorite entity"
            }
          },
          "view": {
Author	SHA1	Message	Date
Bram Kragten	b7a6ee3792	Bumped version to 20250901.0	2025-09-01 21:42:55 +02:00
Wendelin	1fb2f0c989	Automation-keybindings (#26762 ) Co-authored-by: Norbert Rittel <norbert@rittel.de> Co-authored-by: Bram Kragten <mail@bramkragten.nl>	2025-09-01 21:42:19 +02:00
Bram Kragten	b4ad411e6f	Change drag selected styling (#26822 )	2025-09-01 21:41:20 +02:00
Bram Kragten	5d76a92f73	Update hover and hightlight states for automation rows (#26820 )	2025-09-01 21:41:19 +02:00
Paul Bottein	beee09491a	Fix tag trigger when using it inside sidebar (#26819 )	2025-09-01 21:41:18 +02:00
Paul Bottein	ee5aabdddf	Remove box shadow for ha card in automation bottom sheet on mobile (#26817 )	2025-09-01 21:41:17 +02:00
Paul Bottein	ec80f6a6f1	Add automation testing logic to sidebar (#26815 )	2025-09-01 21:41:16 +02:00
Paul Bottein	9845f0b47c	Don't use ha-automation-row-selected to know if the item was selected (#26812 )	2025-09-01 21:41:15 +02:00
Paul Bottein	cd294ba619	Force energy distribution to display the data of today (#26811 )	2025-09-01 21:41:14 +02:00
Paul Bottein	61e27cb1ea	Fix automation sidebar z index (#26810 )	2025-09-01 21:41:14 +02:00
Paul Bottein	8d6295e8e8	Update heading subtitle height to better fix grid (#26808 )	2025-09-01 21:41:13 +02:00
Paul Bottein	b0e95699f7	Fix add dialog on dashboards on mobile (#26807 )	2025-09-01 21:41:12 +02:00
Petar Petrov	c8e1e7b8a8	Handle negative values in History chart card feature (#26806 )	2025-09-01 21:41:11 +02:00
Bram Kragten	d2cea159af	Enable drag and drop on mobile for automations (#26805 )	2025-09-01 21:41:10 +02:00
Petar Petrov	eb5d1c79c8	Use feature-color in History chart feature (#26802 )	2025-09-01 21:41:09 +02:00
Paulus Schoutsen	65ab6848ab	Do not add graphs to every sensor tile card (#26793 )	2025-09-01 21:41:09 +02:00
Paul Bottein	7a1d934e8d	Use summary card in home dashboard (#26775 )	2025-09-01 21:41:08 +02:00
Wendelin	cbacde12fa	Automation editor: fix yaml editor and editor switch (#26772 )	2025-09-01 21:41:07 +02:00
Paul Bottein	3837b3e630	Bumped version to 20250829.0	2025-08-29 17:48:01 +02:00
karwosts	7c15633f6d	Don't use context for media selector with 'accept' (#26773 )	2025-08-29 17:45:59 +02:00
Paul Bottein	f7ec8650eb	Add translations for home dashboard (#26763 )	2025-08-29 17:45:58 +02:00
Paul Bottein	7674eee0fb	Fix alert z-index for automation and script (#26759 )	2025-08-29 17:45:13 +02:00
Norbert Rittel	f494a6453a	Improve OAuth setup explanation (#26758 ) * Improve OAuth setup explanation * Add "your" * Include "application" in headline	2025-08-29 17:43:54 +02:00
Wendelin	37f3682ffa	Automation editor: fix focus handling (#26755 )	2025-08-29 17:42:34 +02:00
Paul Bottein	8055286a1f	Use fixed layout for automation sidebar to have scrollbar on the side (#26751 ) Co-authored-by: Wendelin <12148533+wendevlin@users.noreply.github.com>	2025-08-29 17:39:43 +02:00
Paul Bottein	810b43760e	Bumped version to 20250828.0	2025-08-28 18:51:59 +02:00
Aidan Timson	424d71c55a	Change loading detailed storage to use `ha-alert` with spinner (#26749 ) * Change spinner overlay to use `ha-alert` with messaging * Use spinner for icon slot	2025-08-28 18:51:14 +02:00
Petar Petrov	176924241c	Increase disk usage request timeout (#26748 )	2025-08-28 18:51:13 +02:00
Norbert Rittel	da08aa7fb0	Different spelling fixes of user-facing strings (#26745 ) * Different spelling fixes of user-facing strings * Fix menu "Application credentials" menu item name	2025-08-28 18:51:12 +02:00
Wendelin	6047227648	Automation editor: overflow changes and style fixes (#26744 ) * Fix for width also for blueprint editor * Fix overflow menus * Fix option icons * Fix iOS bottom sheet flickering and drag handle * Fix mobile padding * Fix padding in sidebar * Fix overflow placement * Add new a11y sort * Remove overflow in rows * Fix a11y select row * Revert "Fix a11y select row" This reverts commit `54260c4a37`. * Fix option padding on blueprint --------- Co-authored-by: Paul Bottein <paul.bottein@gmail.com>	2025-08-28 18:51:11 +02:00
Norbert Rittel	fc71fd6bc3	Improve section descriptions in Automation editor (#26741 ) Replace "listed here" or "list of" with "added here"	2025-08-28 18:51:10 +02:00
Wendelin	90a1b135e1	Fix automation editor drag selected row in/out nested (#26740 ) Fix nested sort	2025-08-28 18:51:09 +02:00
Paulus Schoutsen	e19413b6ca	Show binary sensors with graphs on the security dashboard (#26738 )	2025-08-28 18:51:08 +02:00
Paulus Schoutsen	0dfc10af5f	Show configured area sensors on climate domain dashboard (#26737 )	2025-08-28 18:51:07 +02:00
karwosts	bbbc419bea	Hide 'options' from enum more info (#26736 ) * Hide 'options' from enum more info * restrict to specific domain and class	2025-08-28 18:51:06 +02:00
Aidan Timson	50ad5e376f	Move automation and script `ha-alert`s to main flow (#26735 ) Co-authored-by: Wendelin <12148533+wendevlin@users.noreply.github.com>	2025-08-28 18:51:05 +02:00
J. Nick Koston	a9f2254bbc	Improve network adapter configuration discoverability (#26734 )	2025-08-28 18:51:04 +02:00
Paul Bottein	a8836404d4	Use entity picture for home favorite and update home dashboard icon (#26732 ) * Add strategy icon * Use entity picture for favorite	2025-08-28 18:51:03 +02:00