diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 2139baea1e..522dd0df3f 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -4288,7 +4288,7 @@
      (when show-inline-comments?
        [:div.ls-inline-comments
         (when-not (:page-title? config)
-          {:style {:padding-left (if (util/mobile?) 12 45)}})
+          {:class "ls-block-content-indent"})
         (block-comments/comments-area-view
          (assoc config :container-id (comments-model/inline-comment-container-id (:container-id config)))
          comment-thread
@@ -4306,7 +4306,7 @@
                (and
                  (not collapsed?)
                  (not (or table? property?)))))
-       [:div (when-not (:page-title? config) {:style {:padding-left (if (util/mobile?) 12 45)}})
+       [:div (when-not (:page-title? config) {:class "ls-block-content-indent"})
         (db-properties-cp config block {:in-block-container? true})])
 
      (when (and show-query? (not (:table? config)))
diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css
index 3f061269ae..a90e92a017 100644
--- a/src/main/frontend/components/block.css
+++ b/src/main/frontend/components/block.css
@@ -49,6 +49,14 @@
   @apply flex flex-1 flex-col w-full pr-1;
 }
 
+.ls-block-content-indent {
+  padding-left: 45px;
+}
+
+html.is-mobile .ls-block-content-indent {
+  padding-left: 12px;
+}
+
 .block-head-wrap {
   @apply flex flex-1 w-full flex-row flex-wrap;
   @apply justify-between items-center;
diff --git a/src/main/frontend/components/page.cljs b/src/main/frontend/components/page.cljs
index 3ac7e28e59..872c695724 100644
--- a/src/main/frontend/components/page.cljs
+++ b/src/main/frontend/components/page.cljs
@@ -111,7 +111,8 @@
         config (dissoc config* :page)]
     (when (or page? block? (util/mobile?))
       [:div.ls-block.block-add-button.flex-1.flex-col.rounded-sm.cursor-text.transition-opacity.ease-in.duration-100.!py-0
-       {:class opacity-class
+       {:class (util/classnames [opacity-class
+                                  {"ls-block-content-indent" block?}])
         :parentblockid (:db/id block)
         :ref *ref
         :on-click (fn [e]
@@ -141,9 +142,10 @@
         :tab-index 0}
        [:div.flex.flex-row
         [:div.flex.items-center {:style {:height 28
-                                         :margin-left (if (util/mobile?)
-                                                        (if page? 0 18)
-                                                        22)}}
+                                         :margin-left (cond
+                                                        (and block? (not (util/mobile?))) 6
+                                                        (util/mobile?) (if page? 0 18)
+                                                        :else 22)}}
          [:span.bullet-container
           [:span.bullet]]]]])))