diff --git a/layout/_macro/post-collapse.swig b/layout/_macro/post-collapse.swig
index 7fca6ff606..af931d67aa 100644
--- a/layout/_macro/post-collapse.swig
+++ b/layout/_macro/post-collapse.swig
@@ -13,7 +13,7 @@
   {%- endif %}
   {# endshow #}
 
-  <article class="post post-type-{{ post.type | default('normal') }}" itemscope itemtype="http://schema.org/Article">
+  <article class="post" itemscope itemtype="http://schema.org/Article">
     <header class="post-header">
 
       <{%- if theme.seo %}h3{% else %}h2{%- endif %} class="post-title">
@@ -23,11 +23,7 @@
           {{ next_url(post.link, postText + postTitleIcon, {class: 'post-title-link post-title-link-external', itemprop: 'url' }) }}
         {% else %}
           <a class="post-title-link" href="{{ url_for(post.path) }}" itemprop="url">
-            {%- if post.type === 'picture' %}
-              {{ post.content }}
-            {% else %}
-              <span itemprop="name">{{ post.title | default(__('post.untitled')) }}</span>
-            {%- endif %}
+            <span itemprop="name">{{ post.title | default(__('post.untitled')) }}</span>
           </a>
         {%- endif %}
       </{%- if theme.seo %}h3{% else %}h2{%- endif %}>
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index cb8b4fc252..27b84ec041 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -1,9 +1,4 @@
-  {%- set headlessPost = Array.prototype.indexOf.call(['quote', 'picture'], post.type) > -1 %}
-
-  {%- set post_class = 'post post-type-' + post.type | default('normal') %}
-  {%- if post_extra_class > 0 %}
-    {%- set post_class = post_class + ' ' + post_extra_class | default('') %}
-  {%- endif %}
+  {%- set post_class = 'post' %}
   {%- if post.sticky > 0 %}
     {%- set post_class = post_class + ' post-sticky' %}
   {%- endif %}
@@ -29,35 +24,31 @@
       <meta itemprop="name" content="{{ title }}">
     </span>
 
-    {%- if not headlessPost %}
+    {%- if post.header !== false %}
       <header class="post-header">
-
-        {# Not to show title for quote posts that do not have a title #}
-        {%- if not (is_index and post.type === 'quote' and not post.title) %}
-          <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction && post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">{#
-          #}{# Link posts #}{#
-          #}{%- if post.link %}
-              {%- if post.sticky > 0 %}
-                <span class="post-sticky-flag" title="{{ __('post.sticky') }}">
-                  <i class="fa fa-thumb-tack"></i>
-                </span>
-              {%- endif %}
-              {%- set postTitleIcon = '<i class="fa fa-external-link"></i>' %}
-              {%- set postText = post.title or post.link %}
-              {{ next_url(post.link, postText + postTitleIcon, {class: 'post-title-link post-title-link-external', itemprop: 'url' }) }}
-            {% elif is_index %}
-              {%- if post.sticky > 0 %}
-                <span class="post-sticky-flag" title="{{ __('post.sticky') }}">
-                  <i class="fa fa-thumb-tack"></i>
-                </span>
-              {%- endif %}
-              {{ next_url(post.path, post.title | default(__('post.untitled')), {class: 'post-title-link', itemprop: 'url' }) }}
-            {% else -%}
-              {{- post.title -}}
-              {% include '../_partials/post-edit.swig' %}
+        <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction &&post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">{#
+        #}{# Link posts #}{#
+        #}{%- if post.link %}
+            {%- if post.sticky > 0 %}
+              <span class="post-sticky-flag" title="{{ __('post.sticky') }}">
+                <i class="fa fa-thumb-tack"></i>
+              </span>
             {%- endif %}
-          </{%- if theme.seo %}h2{% else %}h1{%- endif %}>
-        {%- endif %}
+            {%- set postTitleIcon = '<i class="fa fa-external-link"></i>' %}
+            {%- set postText = post.title or post.link %}
+            {{ next_url(post.link, postText + postTitleIcon, {class: 'post-title-link post-title-link-external', itemprop: 'url' }) }}
+          {% elif is_index %}
+            {%- if post.sticky > 0 %}
+              <span class="post-sticky-flag" title="{{ __('post.sticky') }}">
+                <i class="fa fa-thumb-tack"></i>
+              </span>
+            {%- endif %}
+            {{ next_url(post.path, post.title | default(__('post.untitled')), {class: 'post-title-link', itemprop: 'url' }) }}
+          {% else -%}
+            {{- post.title -}}
+            {% include '../_partials/post-edit.swig' %}
+          {%- endif %}
+        </{%- if theme.seo %}h2{% else %}h1{%- endif %}>
 
         <div class="post-meta">
 
@@ -235,11 +226,7 @@
           {%- endif %}
           <!--/noindex-->
         {% else %}
-          {%- if post.type === 'picture' %}
-            <a href="{{ url_for(post.path) }}">{{ post.content }}</a>
-          {% else %}
-            {{ post.content }}
-          {%- endif %}
+          {{ post.content }}
         {%- endif %}
       {% else %}
         {{ post.content }}
diff --git a/source/css/_common/components/post/post-type.styl b/source/css/_common/components/post/post-type.styl
deleted file mode 100644
index 4d4011682f..0000000000
--- a/source/css/_common/components/post/post-type.styl
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO: Refactor.
-.page-home, .page-post-detail {
-  .post-type-quote {
-    .post-header, .post-tags {
-      display: none;
-    }
-
-    blockquote {
-      @extend .blockquote-center;
-    }
-  }
-}
diff --git a/source/css/_common/components/post/post.styl b/source/css/_common/components/post/post.styl
index d3b0c46a85..2098508a3e 100644
--- a/source/css/_common/components/post/post.styl
+++ b/source/css/_common/components/post/post.styl
@@ -58,7 +58,6 @@
 @import 'post-rtl';
 @import 'post-tags';
 @import 'post-title';
-@import 'post-type';
 
 @import 'post-reward' if (hexo-config('reward_settings.enable'));