Revert "move battery lock circle to logical place 2/2"

This reverts commit 06b529a38f59e0bf597cfa7a61d38078c2d9e19a.
Revert "move battery lock circle to logical place 1/2"

This reverts commit 24e202e0bc2ccf6cbf0e52e9f1d9f373f90e2f23.