diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..5ace4600
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/deploy_github_releases.yml b/.github/workflows/deploy_github_releases.yml
index ed4716a1..26e946e5 100644
--- a/.github/workflows/deploy_github_releases.yml
+++ b/.github/workflows/deploy_github_releases.yml
@@ -30,19 +30,19 @@ jobs:
         arguments: :app:assembleFreeRelease :app:assembleNonFreeRelease :app:bundleNonFreeRelease
 
     - name: Upload non-free release APK
-      uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
+      uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074
       with:
         name: APS Non-Free Release APK
         path: app/build/outputs/apk/nonFree/release/app-nonFree-release.apk
 
     - name: Upload non-free release Bundle
-      uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
+      uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074
       with:
         name: APS Non-Free Release Bundle
         path: app/build/outputs/bundle/nonFreeRelease/app-nonFree-release.aab
 
     - name: Upload free release APK
-      uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700
+      uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074
       with:
         name: APS Free Release APK
         path: app/build/outputs/apk/free/release/app-free-release.apk
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 10e4c3d7..b94c34f3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -58,7 +58,7 @@ jobs:
 
     - name: (Fail-only) upload test report
       if: failure()
-      uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571
+      uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074
       with:
           name: Test report
           path: app/build/reports
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index 6f86f381..d0479b09 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -17,7 +17,7 @@
     android:id="@+id/username_input_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:hint="@string/git_user_name_hint"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
@@ -35,7 +35,7 @@
     android:id="@+id/email_input_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:hint="@string/git_user_email"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/username_input_layout">
@@ -52,7 +52,7 @@
     android:id="@+id/save_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:text="@string/crypto_save"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toBottomOf="@id/email_input_layout" />
@@ -62,7 +62,7 @@
     style="@style/TextAppearance.MaterialComponents.Headline5"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:text="@string/git_tools"
     android:textSize="24sp"
     android:textStyle="bold"
@@ -73,7 +73,7 @@
     android:id="@+id/git_head_status"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/git_tools_title"
     tools:text="HEAD status" />
@@ -82,7 +82,7 @@
     android:id="@+id/git_log"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:text="@string/git_log"
     app:layout_constraintTop_toBottomOf="@+id/git_head_status" />
 
@@ -90,7 +90,7 @@
     android:id="@+id/git_abort_rebase"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:text="@string/abort_rebase"
     app:layout_constraintTop_toBottomOf="@+id/git_log" />
 
@@ -98,7 +98,7 @@
     android:id="@+id/git_reset_to_remote"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/normal_margin"
+    android:layout_marginTop="8dp"
     android:text="@string/reset_to_remote"
     app:layout_constraintTop_toBottomOf="@id/git_abort_rebase" />