diff --git a/.idea/misc.xml b/.idea/misc.xml
index fb8c126a..6de32e1d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ec998b34..9300b3f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 12
-        versionName "2.5.3"
+        versionCode 13
+        versionName "2.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
index 28079aaf..93a96b25 100644
--- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
@@ -3,6 +3,7 @@ package xyz.quaver.pupil
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
@@ -21,6 +22,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
@@ -31,14 +33,20 @@ import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.android.synthetic.main.dialog_galleryblock.view.*
 import kotlinx.coroutines.*
 import kotlinx.io.IOException
+import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.content
+import kotlinx.serialization.list
+import kotlinx.serialization.parseList
+import kotlinx.serialization.stringify
 import ru.noties.markwon.Markwon
 import xyz.quaver.hitomi.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
+import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.TagSuggestion
+import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.util.*
 import java.io.File
 import java.io.FileInputStream
@@ -56,7 +64,8 @@ class MainActivity : AppCompatActivity() {
     enum class Mode {
         SEARCH,
         HISTORY,
-        DOWNLOAD
+        DOWNLOAD,
+        FAVORITE
     }
 
     private val galleries = ArrayList<Pair<GalleryBlock, Deferred<String>>>()
@@ -73,6 +82,7 @@ class MainActivity : AppCompatActivity() {
 
     private lateinit var histories: Histories
     private lateinit var downloads: Histories
+    private lateinit var favorites: Histories
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -96,6 +106,7 @@ class MainActivity : AppCompatActivity() {
         with(application as Pupil) {
             this@MainActivity.histories = histories
             this@MainActivity.downloads = downloads
+            this@MainActivity.favorites = favorites
         }
 
         setContentView(R.layout.activity_main)
@@ -274,6 +285,7 @@ class MainActivity : AppCompatActivity() {
                     R.id.main_drawer_home -> {
                         cancelFetch()
                         clearGalleries()
+                        currentPage = 0
                         query = ""
                         mode = Mode.SEARCH
                         fetchGalleries(query)
@@ -282,6 +294,7 @@ class MainActivity : AppCompatActivity() {
                     R.id.main_drawer_history -> {
                         cancelFetch()
                         clearGalleries()
+                        currentPage = 0
                         query = ""
                         mode = Mode.HISTORY
                         fetchGalleries(query)
@@ -290,11 +303,21 @@ class MainActivity : AppCompatActivity() {
                     R.id.main_drawer_downloads -> {
                         cancelFetch()
                         clearGalleries()
+                        currentPage = 0
                         query = ""
                         mode = Mode.DOWNLOAD
                         fetchGalleries(query)
                         loadBlocks()
                     }
+                    R.id.main_drawer_favorite -> {
+                        cancelFetch()
+                        clearGalleries()
+                        currentPage = 0
+                        query = ""
+                        mode = Mode.FAVORITE
+                        fetchGalleries(query)
+                        loadBlocks()
+                    }
                     R.id.main_drawer_help -> {
                         startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help))))
                     }
@@ -686,6 +709,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private var suggestionJob : Job? = null
+    @UseExperimental(ImplicitReflectionSerializer::class)
     private fun setupSearchBar() {
         val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
         //Change upper case letters to lower case
@@ -707,6 +731,15 @@ class MainActivity : AppCompatActivity() {
         })
 
         with(main_searchview as FloatingSearchView) {
+            val favoritesFile = File(ContextCompat.getDataDir(context), "favorites_tags.json")
+            val json = Json(JsonConfiguration.Stable)
+            val serializer = Tag.serializer().list
+
+            if (!favoritesFile.exists()) {
+                favoritesFile.createNewFile()
+                favoritesFile.writeText(json.stringify(Tags(listOf())))
+            }
+
             setOnMenuItemClickListener {
                 when(it.itemId) {
                     R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), SETTINGS)
@@ -759,8 +792,9 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
-            setOnBindSuggestionCallback { _, leftIcon, textView, item, _ ->
+            setOnBindSuggestionCallback { suggestionView, leftIcon, textView, item, _ ->
                 val suggestion = item as TagSuggestion
+                val tag = "${suggestion.n}:${suggestion.s.replace(Regex("\\s"), "_")}"
 
                 leftIcon.setImageDrawable(
                     ResourcesCompat.getDrawable(
@@ -778,16 +812,49 @@ class MainActivity : AppCompatActivity() {
                         null)
                 )
 
-                val text = "${suggestion.s}\n ${suggestion.t}"
+                with(suggestionView.findViewById<ImageView>(R.id.right_icon)) {
+                    setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star))
 
-                val len = text.length
-                val left = suggestion.s.length
+                    if (Tags(json.parse(serializer, favoritesFile.readText())).contains(tag))
+                        (drawable as Animatable).start()
 
-                textView.text = SpannableString(text).apply {
-                    val s = AlignmentSpan.Standard(Layout.Alignment.ALIGN_OPPOSITE)
-                    setSpan(s, left, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    setSpan(SetLineOverlap(true), 1, len-2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    setSpan(SetLineOverlap(false), len-1, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                    visibility = View.VISIBLE
+                    rotation = 0f
+                    isEnabled = true
+
+                    setColorFilter(ContextCompat.getColor(context, R.color.material_orange_500))
+
+                    isClickable = true
+                    setOnClickListener {
+                        val favorites = Tags(json.parse(serializer, favoritesFile.readText()))
+
+                        if (favorites.contains(tag)) {
+                            setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star))
+                            favorites.remove(tag)
+                        }
+                        else {
+                            (drawable as Animatable).start()
+                            favorites.add(tag)
+                        }
+
+                        favoritesFile.writeText(json.stringify(favorites))
+                    }
+                }
+
+                if (suggestion.t == -1) {
+                    textView.text = suggestion.s
+                } else {
+                    val text = "${suggestion.s}\n ${suggestion.t}"
+
+                    val len = text.length
+                    val left = suggestion.s.length
+
+                    textView.text = SpannableString(text).apply {
+                        val s = AlignmentSpan.Standard(Layout.Alignment.ALIGN_OPPOSITE)
+                        setSpan(s, left, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                        setSpan(SetLineOverlap(true), 1, len-2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                        setSpan(SetLineOverlap(false), len-1, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                    }
                 }
             }
 
@@ -810,7 +877,10 @@ class MainActivity : AppCompatActivity() {
 
             setOnFocusChangeListener(object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
-                    //Do Nothing
+                    if (searchInputView.text.isEmpty())
+                        swapSuggestions(json.parse(serializer, favoritesFile.readText()).map {
+                            TagSuggestion(it.tag, -1, "", it.area ?: "tag")
+                        })
                 }
 
                 override fun onFocusCleared() {
@@ -824,6 +894,7 @@ class MainActivity : AppCompatActivity() {
                         runOnUiThread {
                             cancelFetch()
                             clearGalleries()
+                            currentPage = 0
                             fetchGalleries(query)
                             loadBlocks()
                         }
@@ -910,6 +981,19 @@ class MainActivity : AppCompatActivity() {
                         }
                     }
                 }
+                Mode.FAVORITE -> {
+                    when {
+                        query.isEmpty() -> favorites.toList().apply {
+                            totalItems = size
+                        }
+                        else -> {
+                            val result = doSearch(query).sorted()
+                            favorites.filter { result.binarySearch(it) >= 0 }.apply {
+                                totalItems = size
+                            }
+                        }
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
index c4115c85..368b183a 100644
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -16,12 +16,14 @@ class Pupil : ObservableApplication() {
 
     lateinit var histories: Histories
     lateinit var downloads: Histories
+    lateinit var favorites: Histories
 
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
         downloads = Histories(File(ContextCompat.getDataDir(this), "downloads.json"))
+        favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 
         super.onCreate()
         Fn.init(this)
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
index 183c90d9..96f5b609 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -1,6 +1,8 @@
 package xyz.quaver.pupil.adapters
 
 import android.graphics.BitmapFactory
+import android.graphics.drawable.Animatable
+import android.util.Log
 import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
@@ -21,8 +23,10 @@ import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.ReaderItem
+import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.util.Histories
 import java.io.File
 import java.util.*
 import kotlin.collections.ArrayList
@@ -37,6 +41,8 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
         PREV
     }
 
+    private lateinit var favorites: Histories
+
     inner class GalleryViewHolder(private val view: CardView) : RecyclerView.ViewHolder(view) {
         fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
             with(view) {
@@ -202,6 +208,27 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre
 
                     galleryblock_tag_group.addView(chip)
                 }
+
+                if (!::favorites.isInitialized)
+                    favorites = (context.applicationContext as Pupil).favorites
+
+                with(galleryblock_favorite) {
+                    post {
+                        isChecked = favorites.contains(gallery.id)
+                    }
+                    setOnClickListener {
+                        when {
+                            isChecked -> favorites.add(gallery.id)
+                            else -> favorites.remove(gallery.id)
+                        }
+                    }
+                    setOnCheckedChangeListener { _, isChecked ->
+                        when {
+                            isChecked -> (background as Animatable).start()
+                            else -> background = AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star)
+                        }
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/types/Tags.kt b/app/src/main/java/xyz/quaver/pupil/types/Tags.kt
index b7e8039b..70d0a119 100644
--- a/app/src/main/java/xyz/quaver/pupil/types/Tags.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Tags.kt
@@ -1,5 +1,8 @@
 package xyz.quaver.pupil.types
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
     companion object {
         fun parse(tag: String) : Tag {
diff --git a/app/src/main/res/drawable/avd_star.xml b/app/src/main/res/drawable/avd_star.xml
new file mode 100644
index 00000000..6ae49f20
--- /dev/null
+++ b/app/src/main/res/drawable/avd_star.xml
@@ -0,0 +1,37 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="newApi">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:name="path"
+                android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"
+                android:fillColor="#000"/>
+            <clip-path
+                android:name="clip"
+                android:pathData="M 2 21 L 2 21 L 22 21 L 22 21 Z"/>
+            <path
+                android:name="path_1"
+                android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"
+                android:fillColor="#000"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="clip">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="pathData"
+                android:duration="500"
+                android:valueFrom="M 2 21 L 2 21 L 22 21 L 22 21 Z"
+                android:valueTo="M 2 2 L 2 21 L 22 21 L 22 2 Z"
+                android:valueType="pathType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/ic_hiyobi.png b/app/src/main/res/drawable/ic_hiyobi.png
new file mode 100644
index 00000000..2af60c05
Binary files /dev/null and b/app/src/main/res/drawable/ic_hiyobi.png differ
diff --git a/app/src/main/res/drawable/ic_star_empty.xml b/app/src/main/res/drawable/ic_star_empty.xml
new file mode 100644
index 00000000..2231c7f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_empty.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:width="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:pathData="M 12 15.39 L 8.24 17.66 L 9.23 13.38 L 5.91 10.5 L 10.29 10.13 L 12 6.09 L 13.71 10.13 L 18.09 10.5 L 14.77 13.38 L 15.76 17.66 M 22 9.24 L 14.81 8.63 L 12 2 L 9.19 8.63 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_filled.xml b/app/src/main/res/drawable/ic_star_filled.xml
new file mode 100644
index 00000000..ae9a8278
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_filled.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:width="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:pathData="M 12 17.27 L 18.18 21 L 16.54 13.97 L 22 9.24 L 14.81 8.62 L 12 2 L 9.19 8.62 L 2 9.24 L 7.45 13.97 L 5.82 21 L 12 17.27 Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_galleryblock.xml b/app/src/main/res/layout/item_galleryblock.xml
index c4184f3d..8186c6a5 100644
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -14,111 +14,145 @@
 	android:focusable="true"
 	android:clickable="true">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
+	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
 
-		<ProgressBar
-			style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-			android:id="@+id/galleryblock_progressbar"
+		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
-			android:layout_height="4dp"
-			android:visibility="gone"
-			app:layout_constraintTop_toTopOf="parent"/>
+			android:layout_height="wrap_content">
 
-		<ImageView
-			android:id="@+id/galleryblock_progress_complete"
-			android:layout_width="match_parent"
-			android:layout_height="4dp"
-			android:visibility="invisible"
-			android:scaleType="fitXY"
-			android:contentDescription="@string/reader_imageview_description"
-			app:layout_constraintTop_toTopOf="parent"/>
+			<ProgressBar
+				style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+				android:id="@+id/galleryblock_progressbar"
+				android:layout_width="match_parent"
+				android:layout_height="4dp"
+				android:visibility="gone"
+				app:layout_constraintTop_toTopOf="parent"/>
 
-		<ImageView
-			android:id="@+id/galleryblock_thumbnail"
-			android:layout_width="150dp"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/galleryblock_thumbnail_description"
-			android:adjustViewBounds="true"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
-			app:layout_constraintBottom_toBottomOf="parent"/>
+			<ImageView
+				android:id="@+id/galleryblock_progress_complete"
+				android:layout_width="match_parent"
+				android:layout_height="4dp"
+				android:visibility="invisible"
+				android:scaleType="fitXY"
+				android:contentDescription="@string/reader_imageview_description"
+				app:layout_constraintTop_toTopOf="parent"/>
 
-		<TextView
-			style="@style/TextAppearance.AppCompat.Headline"
-			android:id="@+id/galleryblock_title"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			<ImageView
+				android:id="@+id/galleryblock_thumbnail"
+				android:layout_width="150dp"
+				android:layout_height="wrap_content"
+				android:contentDescription="@string/galleryblock_thumbnail_description"
+				android:adjustViewBounds="true"
+				app:layout_constraintLeft_toLeftOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_progressbar"
+				app:layout_constraintBottom_toBottomOf="parent"/>
 
-		<TextView
-			style="@style/TextAppearance.AppCompat.Medium"
-			android:id="@+id/galleryblock_artist"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_title"/>
+			<TextView
+				style="@style/TextAppearance.AppCompat.Headline"
+				android:id="@+id/galleryblock_title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="8dp"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+				app:layout_constraintRight_toRightOf="parent"
+				app:layout_constraintTop_toTopOf="parent"/>
 
-		<TextView
-			android:id="@+id/galleryblock_series"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
-			app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
-			app:layout_constraintEnd_toEndOf="parent"/>
+			<TextView
+				style="@style/TextAppearance.AppCompat.Medium"
+				android:id="@+id/galleryblock_artist"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+				app:layout_constraintRight_toRightOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_title"/>
 
-		<TextView
-			android:id="@+id/galleryblock_type"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
-			app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+			<TextView
+				android:id="@+id/galleryblock_series"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_artist"
+				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
+				app:layout_constraintEnd_toEndOf="parent"/>
 
-		<TextView
-			android:id="@+id/galleryblock_language"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginBottom="8dp"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
-			app:layout_constraintBottom_toTopOf="@id/galleryblock_padding"
-			app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+			<TextView
+				android:id="@+id/galleryblock_type"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_series"
+				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+
+			<TextView
+				android:id="@+id/galleryblock_language"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginBottom="8dp"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_type"
+				app:layout_constraintBottom_toTopOf="@id/galleryblock_padding"
+				app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail" />
+
+			<View
+				android:id="@+id/galleryblock_padding"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
+				app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
+
+			<com.google.android.material.chip.ChipGroup
+				android:id="@+id/galleryblock_tag_group"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="8dp"
+				android:layout_marginStart="8dp"
+				android:layout_marginTop="16dp"
+				android:layout_marginBottom="16dp"
+				app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
+				app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
+				app:layout_constraintRight_toRightOf="parent"
+				app:layout_constraintBottom_toBottomOf="parent"/>
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
 
 		<View
-			android:id="@+id/galleryblock_padding"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			app:layout_constraintStart_toEndOf="@id/galleryblock_thumbnail"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_language"
-			app:layout_constraintBottom_toTopOf="@id/galleryblock_tag_group"/>
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_margin="8dp"
+			android:background="@android:color/darker_gray"/>
 
-		<com.google.android.material.chip.ChipGroup
-			android:id="@+id/galleryblock_tag_group"
-			android:layout_width="0dp"
+		<LinearLayout
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/galleryblock_padding"
-			app:layout_constraintBottom_toBottomOf="parent"/>
+			android:orientation="horizontal"
+			android:gravity="end">
 
-	</androidx.constraintlayout.widget.ConstraintLayout>
+			<ToggleButton
+				android:id="@+id/galleryblock_favorite"
+				android:layout_width="32dp"
+				android:layout_height="32dp"
+				android:layout_marginEnd="8dp"
+				android:layout_marginRight="8dp"
+				android:layout_marginBottom="8dp"
+				android:background="@drawable/avd_star"
+				android:backgroundTint="@color/material_orange_500"
+				android:text=""
+				android:textOn=""
+				android:textOff=""/>
+
+		</LinearLayout>
+
+	</LinearLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 4185cf90..3959e386 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -14,6 +14,10 @@
         <item android:id="@+id/main_drawer_downloads"
             android:title="@string/main_drawer_downloads"
             android:icon="@drawable/ic_download"/>
+
+        <item android:id="@+id/main_drawer_favorite"
+            android:title="@string/main_drawer_favorite"
+            android:icon="@drawable/ic_star_filled"/>
     </group>
 
     <item android:title="@string/main_drawer_group_contact_title">
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 81f0d436..6bbd36f7 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -67,4 +67,5 @@
     <string name="settings_clear_downloads">ダウンロード削除</string>
     <string name="settings_clear_downloads_alert_message">ダウンロードしたギャラリーを全て削除します。\n実行しますか？</string>
     <string name="settings_use_hiyobi_summary">ロード速度を向上させるため可能であればhiyobi.meからイメージロード</string>
+    <string name="main_drawer_favorite">お気に入り</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 7cfc9b9b..ef0c2380 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -67,4 +67,5 @@
     <string name="settings_clear_downloads">다운로드 삭제</string>
     <string name="settings_clear_downloads_alert_message">다운로드 된 만화를 모두 삭제합니다.\n계속하시겠습니까?</string>
     <string name="settings_use_hiyobi_summary">속도 향상을 위해 가능하면 hiyobi.me에서 이미지 로드</string>
+    <string name="main_drawer_favorite">즐겨찾기</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index efe64a23..efa2ab65 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,4 +8,5 @@
     <color name="material_pink_600">#d81b60</color>
     <color name="material_blue_700">#1976d2</color>
     <color name="material_green_a700">#00c853</color>
+    <color name="material_orange_500">#ff9800</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f925497f..0dffc533 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,7 @@
     <string name="main_drawer_home">Home</string>
     <string name="main_drawer_history">History</string>
     <string name="main_drawer_downloads">Downloads</string>
+    <string name="main_drawer_favorite">Favorites</string>
     <string name="main_drawer_group_contact_title">Contact</string>
     <string name="main_drawer_group_contact_help">Help</string>
     <string name="main_drawer_group_contact_homepage">Visit homepage</string>