diff --git a/resources/js/components/forum/post-wrapper.vue b/resources/js/components/forum/post-wrapper.vue
deleted file mode 100644
index 10eef8c3e1..0000000000
--- a/resources/js/components/forum/post-wrapper.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <vue-post :post="post" @reply="reply"/>
-</template>
-
-<script lang="ts">
-import VuePost from '../forum/post.vue';
-
-export default {
-  components: {VuePost},
-  emits: ['reply'],
-  props: {
-    post: {
-      type: Object,
-      required: true,
-    },
-  },
-  methods: {
-    reply(post, scrollIntoForm) {
-      this.$emit('reply', post, scrollIntoForm);
-    },
-  },
-};
-</script>
diff --git a/resources/js/components/forum/post.vue b/resources/js/components/forum/post.vue
index bd5b890140..eadd80cb17 100644
--- a/resources/js/components/forum/post.vue
+++ b/resources/js/components/forum/post.vue
@@ -1,152 +1,69 @@
 <template>
-  <div :id="anchor"
-       class="card card-post"
-       :class="{'is-deleted': hidden, 'not-read': !post.is_read, 'highlight-flash': highlight, 'post-deleted-collapsed':isCollapsed}">
-    <div v-if="post.deleted_at"
-         @click="isCollapsed = !isCollapsed"
-         class="post-delete card-body text-decoration-none">
-      <vue-icon name="postDeleted"/>
-      Post usunięty
-      <vue-timeago :datetime="post.deleted_at"/>
-      <template v-if="post.deleter_name">przez {{ post.deleter_name }}.</template>
-      <template v-else>.</template>
-      <template v-if="post.delete_reason">Powód: {{ post.delete_reason }}.</template>
-    </div>
-    <div v-else-if="authorBlocked" class="post-delete card-body text-decoration-none" @click="isCollapsed = !isCollapsed">
-      <vue-icon name="postAuthorBlocked"/>
-      Treść posta została ukryta, ponieważ autorem jest zablokowany przez Ciebie użytkownik.
-    </div>
-    <div :class="{'collapse': isCollapsed, 'd-lg-block': !isCollapsed}" class="card-header d-none">
-      <div class="row">
-        <div class="col-2">
-          <h5 class="mb-0 post-author">
-            <vue-username v-if="post.user" :user="post.user" :owner="post.user_id === topic.owner_id"/>
+  <div class="d-flex">
+    <vue-avatar
+      v-if="post.user"
+      :name="post.user.name"
+      :photo="post.user.photo"
+      :is-online="post.user.is_online"
+      :initials="post.user.initials"
+      class="d-block img-thumbnail me-2 flex-shrink-0"
+      style="width:45px; height:45px;"
+    />
+    <div :id="anchor"
+         class="card card-post flex-grow-1"
+         :class="{'is-deleted': hidden, 'not-read': !post.is_read, 'highlight-flash': highlight, 'post-deleted-collapsed':isCollapsed}">
+      <div v-if="post.deleted_at"
+           @click="isCollapsed = !isCollapsed"
+           class="post-delete card-body text-decoration-none">
+        <vue-icon name="postDeleted"/>
+        Post usunięty
+        <vue-timeago :datetime="post.deleted_at"/>
+        <template v-if="post.deleter_name">przez {{ post.deleter_name }}.</template>
+        <template v-else>.</template>
+        <template v-if="post.delete_reason">Powód: {{ post.delete_reason }}.</template>
+      </div>
+      <div v-else-if="authorBlocked" class="post-delete card-body text-decoration-none" @click="isCollapsed = !isCollapsed">
+        <vue-icon name="postAuthorBlocked"/>
+        Treść posta została ukryta, ponieważ autorem jest zablokowany przez Ciebie użytkownik.
+      </div>
+      <div class="card-header d-none" :class="[isCollapsed ? 'collapse' : 'd-lg-flex align-items-center']">
+        <span>
+          <span class="badge badge-secondary mb-1 me-1" v-text="post.user.group_name" v-if="post.user.group_name"/>
+          {{ ' ' }}
+          <span class="mb-0 post-author">
+            <vue-username v-if="post.user" :user="post.user" :owner="post.user_id === topic.owner_id"></vue-username>
             <span v-else>{{ post.user_name }}</span>
-          </h5>
-        </div>
-
-        <div class="col-10 text-truncate small">
-          <vue-icon v-if="post.is_read" name="postWasRead"/>
-          <i v-else class="not-read" title="Nowy post"/>
+          </span>
           {{ ' ' }}
-          <a :href="post.url" class="small text-body">
-            <vue-timeago :datetime="post.created_at"/>
+          <i v-if="post.is_read" class="not-read" title="Nowy post"/>
+        </span>
+        {{ ' ' }}
+        <span v-if="post.edit_count" class="edit-info ms-auto text-muted">
+          <a class="btn-history" :href="'/Forum/Post/Log/' + post.id" v-if="post.permissions.adm_access">
+            edytowany
           </a>
+          <span v-else>
+            edytowany
+          </span>
+          <template v-if="post.edit_count === 1">przez</template>
+          <template v-else>{{ post.edit_count }}x, ostatnio:</template>
           {{ ' ' }}
-          <a v-if="post.ip" :href="`/Adm/Stream?ip=${post.ip}`" :title="post.ip" class="text-muted small">
-            {{ post.ip }}
-          </a>
+          <vue-username :user="post.editor"/>
           {{ ' ' }}
-          <small v-if="post.browser" :title="post.browser" class="text-muted">{{ post.browser }}</small>
-        </div>
-      </div>
-    </div>
-    <vue-post-review
-      v-if="post.has_review"
-      :post-id="post.id"
-      :review-style="post.review_style"
-      @close="closePostReview"
-      @answer="postReviewAnswer"
-    />
-    <div :class="{'collapse': isCollapsed}" class="card-body">
-      <div class="media d-lg-none mb-2">
-        <div class="media-left me-2">
-          <vue-avatar
-            v-if="post.user"
-            :name="post.user.name"
-            :photo="post.user.photo"
-            :is-online="post.user.is_online"
-            :initials="post.user.initials"
-            class="d-block i-35 img-thumbnail"
-          ></vue-avatar>
-        </div>
-
-        <div class="media-body">
-          <h5 class="mb-0 post-author">
-            <vue-username v-if="post.user" :user="post.user" :owner="post.user_id === topic.owner_id"></vue-username>
-            <span v-else>{{ post.user_name }}</span>
-          </h5>
-
-          <a :href="post.url" class="text-muted small">
-            <vue-timeago :datetime="post.created_at"/>
-          </a>
-
-          <a v-if="post.ip" :href="`/Adm/Stream?ip=${post.ip}`" :title="post.ip" class="text-muted small">
-            ({{ post.ip }})
-          </a>
-        </div>
+          <vue-timeago :datetime="post.updated_at"/>
+        </span>
       </div>
-
-      <div class="row">
-        <div class="d-none d-lg-block col-lg-2">
-          <template v-if="post.user">
-            <vue-avatar
-              v-if="post.user"
-              :name="post.user.name"
-              :photo="post.user.photo"
-              :initials="post.user.initials"
-              :is-online="post.user.is_online"
-              class="post-avatar img-thumbnail"
-            ></vue-avatar>
-
-            <span v-if="post.user.group_name" class="badge badge-secondary mb-1">{{ post.user.group_name }}</span>
-
-            <ul class="post-stats list-unstyled">
-              <li>
-                <strong>Rejestracja:</strong>
-                <small>{{ formatDistanceToNow(post.user.created_at) }}</small>
-              </li>
-
-              <li>
-                <strong>Ostatnio:</strong>
-                <small>
-                  {{ formatDistanceToNow(post.user.visited_at ? post.user.visited_at : post.user.created_at) }}
-                </small>
-              </li>
-
-              <li v-if="post.user.location">
-                <strong>Lokalizacja:</strong>
-                <small>{{ post.user.location }}</small>
-              </li>
-
-              <li v-if="post.user.allow_count">
-                <strong>Postów:</strong>
-                <small>
-                  <a title="Znajdź posty tego użytkownika"
-                     :href="`/Forum/User/${post.user.id}`"
-                     style="text-decoration: underline">{{ post.user.posts }}</a>
-                </small>
-              </li>
-            </ul>
-          </template>
-        </div>
-
-        <div v-show="!post.is_editing" class="col-12 col-lg-10">
+      <vue-post-review
+        v-if="post.has_review"
+        :post-id="post.id"
+        :review-style="post.review_style"
+        @close="closePostReview"
+        @answer="postReviewAnswer"
+      />
+      <div :class="{'collapse': isCollapsed}" class="card-body">
+        <div v-show="!post.is_editing">
           <vue-flag v-for="flag in flags" :key="flag.id" :flag="flag"/>
           <div class="post-vote">
-            <strong
-              class="vote-count"
-              title="Ocena posta"
-              @click="loadVoters(post)"
-              :aria-label="voters"
-              data-balloon-pos="left"
-              data-balloon-break
-              v-text="post.score"
-            />
-            <a
-              v-if="!hidden"
-              :class="{'on': post.is_voted}"
-              :aria-label="voters"
-              @click="checkAuth(vote, post)"
-              @mouseenter.once="loadVoters(post)"
-              data-balloon-pos="left"
-              data-balloon-break
-              class="vote-up"
-              href="javascript:"
-            >
-              <vue-icon name="postVoted" v-if="post.is_voted"/>
-              <vue-icon name="postVote" v-else/>
-            </a>
             <a v-if="!hidden && post.permissions.accept"
                :class="{'on': post.is_accepted}"
                @click="accept(post)"
@@ -176,50 +93,11 @@
             </template>
           </div>
           <vue-tags :tags="tags" class="tag-clouds-md mt-2 mb-2"/>
-          <div v-if="post.edit_count" class="edit-info">
-            <strong>
-              <a class="btn-history"
-                 title="Zobacz historię zmian tego posta"
-                 :href="'/Forum/Post/Log/' + post.id"
-                 v-if="post.permissions.update">
-                <vue-icon name="postEditHistoryShow"/>
-              </a>
-              edytowany {{ post.edit_count }}x,
-              ostatnio:
-              <vue-username :user="post.editor"/>
-            </strong>
-            {{ ' ' }}
-            <vue-timeago :datetime="post.updated_at"/>
-          </div>
-          <div class="post-comments">
-            <div v-if="post.comments_count > Object.keys(post.comments).length"
-                 class="d-inline-block mb-2 show-all-comments">
-              <a @click="loadComments(post)" href="javascript:">
-                <vue-icon name="postFoldedCommentsUnfold"/>
-                Zobacz
-                {{ declination(totalComments, ['pozostały', 'pozostałe', 'pozostałe']) }}
-                {{ totalComments }}
-                {{ declination(totalComments, ['komentarz', 'komentarze', 'komentarzy']) }}
-              </a>
-            </div>
-            <vue-comment
-              v-for="comment in post.comments"
-              :key="comment.id"
-              :comment="comment"/>
-            <vue-comment-form
-              v-show="isCommenting"
-              :comment="commentDefault"
-              @save="isCommenting = false"
-              @cancel="isCommenting = false"
-              ref="comment-form"
-              class="mt-2"/>
-          </div>
         </div>
-
         <vue-form
           v-if="post.is_editing"
           ref="form"
-          class="col-12 col-lg-10 mt-2 mb-2"
+          class="mt-2 mb-2"
           :post="post"
           :show-title-input="post.id === topic.first_post_id"
           :show-tags-input="post.id === topic.first_post_id"
@@ -230,13 +108,26 @@
           @save="$store.commit('posts/edit', post)"
         />
       </div>
-    </div>
 
-    <div :class="{'collapse': isCollapsed}" class="card-footer" v-if="!authorBlocked">
-      <div class="row">
-        <div class="d-none d-lg-block col-lg-2"/>
-        <div class="col-12 d-flex col-lg-10">
+      <div :class="{'collapse': isCollapsed}" class="card-footer" v-if="!authorBlocked">
+        <div class="d-flex">
           <div v-if="!post.deleted_at">
+            <button
+              type="button"
+              class="btn btn-sm"
+              v-if="!hidden"
+              :aria-label="voters"
+              @click="checkAuth(vote, post)"
+              @mouseenter.once="loadVoters(post)"
+              data-balloon-pos="down"
+              data-balloon-break
+            >
+              <span class="me-2" v-text="post.score"/>
+              <vue-icon name="postVoted" class="text-primary" v-if="post.is_voted"/>
+              <vue-icon name="postVote" v-else/>
+              Doceń
+            </button>
+
             <button @click="checkAuth(subscribe, post)" class="btn btn-sm">
               <span v-if="post.is_subscribed" class="text-primary">
                 <vue-icon name="postSubscribed"/>
@@ -249,17 +140,15 @@
               <vue-icon name="postShare"/>
               <span class="d-none d-sm-inline ms-1">Udostępnij</span>
             </button>
-
-            <button v-if="!post.is_locked || post.permissions.write" @click="checkAuth(comment)" class="btn btn-sm">
-              <span v-if="isCommenting" class="text-primary">
-                <vue-icon name="postCommentActive"/>
-              </span>
-              <vue-icon v-else name="postComment"/>
-              <span class="d-none d-sm-inline ms-1">Komentuj</span>
-            </button>
           </div>
+          <div v-if="post.permissions.write">
+            <template v-if="!post.deleted_at">
+              <button @click="$emit('reply', post, false)" class="btn btn-sm" title="Dodaj cytat do pola odpowiedzi">
+                <vue-icon name="postAnswerQuote"/>
+                <span class="d-none d-sm-inline ms-1">Odpowiedz</span>
+              </button>
+            </template>
 
-          <div v-if="post.permissions.write" class="ms-auto">
             <button v-if="post.permissions.update && !post.deleted_at" @click="edit" class="btn btn-sm">
               <span v-if="post.is_editing" class="text-primary">
                 <vue-icon name="postEditActive"/>
@@ -281,22 +170,6 @@
               </button>
             </template>
 
-            <template v-if="!post.deleted_at">
-              <button @click="$emit('reply', post)" class="btn btn-sm btn-fast-reply" title="Odpowiedz na ten post">
-                <vue-icon name="postMentionAuthor"/>
-              </button>
-
-              <button @click="$emit('reply', post, false)" class="btn btn-sm" title="Dodaj cytat do pola odpowiedzi">
-                <vue-icon name="postAnswerQuote"/>
-                <span class="d-none d-sm-inline ms-1">Odpowiedz</span>
-              </button>
-
-              <a href="javascript:" :data-metadata="post.metadata" :data-url="post.url" class="btn btn-sm">
-                <vue-icon name="postReport"/>
-                <span class="d-none d-sm-inline ms-1">Zgłoś</span>
-              </a>
-            </template>
-
             <div v-if="post.permissions.merge || post.permissions.adm_access" class="dropdown float-end">
               <button class="btn btn-sm" data-bs-toggle="dropdown">
                 <vue-icon name="postMenuDropdown"/>
@@ -319,8 +192,9 @@
           </div>
         </div>
       </div>
+      <vue-modal ref="delete-modal" @delete="reasonId => deletePost(false, reasonId)" :reasons="reasons"/>
     </div>
-    <vue-modal ref="delete-modal" @delete="reasonId => deletePost(false, reasonId)" :reasons="reasons"/>
+
   </div>
 </template>
 
diff --git a/resources/js/pages/forum/posts.ts b/resources/js/pages/forum/posts.ts
index d652d73b57..dc87bdad3f 100644
--- a/resources/js/pages/forum/posts.ts
+++ b/resources/js/pages/forum/posts.ts
@@ -2,18 +2,18 @@ import {mapGetters, mapState} from "vuex";
 
 import VueForm from "../../components/forum/form.vue";
 import VuePoll from "../../components/forum/poll.vue";
-import VuePostWrapper from "../../components/forum/post-wrapper.vue";
+import VuePost from "../../components/forum/post.vue";
 import VuePagination from "../../components/pagination.vue";
 import {PostCommentSaved, PostSaved, PostVoted, Subscriber} from "../../libs/live";
 import store from "../../store/index";
-import {Post} from "../../types/models";
 import {notify} from "../../toast";
+import {Post} from "../../types/models";
 
 export default {
   name: 'Posts',
   delimiters: ['${', '}'],
   components: {
-    'vue-post-wrapper': VuePostWrapper,
+    'vue-post': VuePost,
     'vue-form': VueForm,
     'vue-poll': VuePoll,
     'vue-pagination': VuePagination,
diff --git a/resources/sass/components/forum/_post.scss b/resources/sass/components/forum/_post.scss
index 7cc2dd2d8f..97315c96e5 100644
--- a/resources/sass/components/forum/_post.scss
+++ b/resources/sass/components/forum/_post.scss
@@ -113,7 +113,7 @@
 }
 
 .post-content {
-  min-height: 89px;
+  min-height: 50px;
   word-wrap: break-word;
   line-height: 139%;
   overflow: hidden;
@@ -181,8 +181,6 @@
 
 .edit-info {
   font-size: 11px;
-  padding: 5px 0;
-  margin-top: 10px;
   color: $body-color;
 
   a {
@@ -194,9 +192,7 @@
   }
 }
 
-.vote-count, .vote-up, .vote-accept {
-  color: lighten($gray-light, 10%);
-
+.vote-accept {
   width: 36px;
   text-align: center;
   display: block;
@@ -215,12 +211,7 @@
   line-height: 120%;
 }
 
-.vote-up.on {
-  color: $primary;
-}
-
 .vote-up, .vote-count {
-  font-size: $font-size-lg;
   z-index: 1; // @see https://4programmers.net/Forum/Coyote/348514-kod_zaslania_liste_lapek?p=1741365#comment-690455
 }
 
diff --git a/resources/views/forum/topic.twig b/resources/views/forum/topic.twig
index e5885761c3..f41d900bd6 100644
--- a/resources/views/forum/topic.twig
+++ b/resources/views/forum/topic.twig
@@ -129,12 +129,12 @@
         <vue-poll :poll="poll"></vue-poll>
       </template>
 
-      <vue-post-wrapper
+      <vue-post
           v-for="post in posts"
           :key="post.id"
           :post="post"
           @reply="reply"
-      ></vue-post-wrapper>
+      ></vue-post>
 
       <div class="page-pagination d-flex mb-3">
         <div class="page-page-selector me-auto">