diff --git a/.idea/dictionaries/tateisu.xml b/.idea/dictionaries/tateisu.xml
index a581bfab..ab96db40 100644
--- a/.idea/dictionaries/tateisu.xml
+++ b/.idea/dictionaries/tateisu.xml
@@ -47,6 +47,7 @@
       <w>kotlinx</w>
       <w>mailto</w>
       <w>mimumedon</w>
+      <w>mpga</w>
       <w>navi</w>
       <w>nicodic</w>
       <w>nicoru</w>
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
index 5832af27..bbec9931 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
@@ -25,6 +25,7 @@ import android.text.SpannableString
 import android.text.TextWatcher
 import android.view.View
 import android.widget.*
+import jp.juggler.subwaytooter.Styler.defaultColorIcon
 import jp.juggler.subwaytooter.api.*
 import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.dialog.ActionsDialog
@@ -725,9 +726,9 @@ class ActAccountSetting
 	
 	private fun initializeProfile() {
 		// 初期状態
-		val question_id = getAttributeResourceId(this, R.attr.ic_question)
-		ivProfileAvatar.setErrorImageResId(question_id)
-		ivProfileAvatar.setDefaultImageResId(question_id)
+		val question_id = R.drawable.wide_question
+		ivProfileAvatar.setErrorImage( defaultColorIcon(this,question_id))
+		ivProfileAvatar.setDefaultImage( defaultColorIcon(this,question_id))
 		
 		val loadingText = when(account.isPseudo) {
 			true -> "(disabled for pseudo account)"
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
index 465d44ca..7dc75661 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
@@ -679,10 +679,10 @@ class ActAppSettingChild : AppCompatActivity()
 		)
 		
 		tvColumnName !!.textColor = header_fg
-		setIconAttr(
+		setIconDrawableId(
 			this,
 			ivColumnHeader !!,
-			R.attr.btn_federate_tl,
+			R.drawable.ic_bike,
 			color = header_fg
 		)
 	}
@@ -1092,13 +1092,9 @@ class ActAppSettingChild : AppCompatActivity()
 		}
 		
 		c = footer_button_fg_color
-		if(c == 0) {
-			setIconAttr(this, ivFooterToot !!, R.attr.ic_edit)
-			setIconAttr(this, ivFooterMenu !!, R.attr.ic_hamburger)
-		} else {
-			setIconAttr(this, ivFooterToot !!, R.attr.ic_edit, color = c)
-			setIconAttr(this, ivFooterMenu !!, R.attr.ic_hamburger, color = c)
-		}
+		if(c == 0)  c= getAttributeColor(this,R.attr.colorVectorDrawable)
+		setIconDrawableId(this, ivFooterToot !!, R.drawable.ic_edit, color = c)
+		setIconDrawableId(this, ivFooterMenu !!, R.drawable.ic_hamburger, color = c)
 		
 		c = footer_tab_bg_color
 		if(c == 0) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt b/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt
index f6c69a3f..19588517 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt
@@ -392,10 +392,10 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke
 			
 			val c = column.getHeaderNameColor()
 			tvColumnName.textColor = c
-			setIconAttr(
+			setIconDrawableId(
 				this,
 				ivColumnHeader,
-				column.getIconAttrId(column.column_type),
+				column.getIconId(column.column_type),
 				color = c
 			)
 			
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActColumnList.kt b/app/src/main/java/jp/juggler/subwaytooter/ActColumnList.kt
index 249c20a5..ffc3e907 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActColumnList.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActColumnList.kt
@@ -3,7 +3,9 @@ package jp.juggler.subwaytooter
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.view.View
@@ -265,10 +267,11 @@ class ActColumnList : AppCompatActivity() {
 			tvAccess.setBackgroundColor(item.acct_color_bg)
 			tvAccess.setPaddingRelative(acct_pad_lr, 0, acct_pad_lr, 0)
 			tvName.text = item.name
-			ivColumnIcon.setImageResource(
-				getAttributeResourceId(
-					this@ActColumnList, Column.getIconAttrId(item.acct, item.type)
-				)
+			ivColumnIcon.setImageDrawable(
+				ContextCompat.getDrawable(this@ActColumnList,Column.getIconId(item.acct, item.type))?.also{
+					it.setTint(getAttributeColor(this@ActColumnList,R.attr.colorVectorDrawable))
+					it.setTintMode(PorterDuff.Mode.SRC_IN)
+				}
 			)
 		}
 		
@@ -299,10 +302,11 @@ class ActColumnList : AppCompatActivity() {
 			tv.text = item.name
 			
 			val ivColumnIcon = dragView.findViewById<ImageView>(R.id.ivColumnIcon)
-			ivColumnIcon.setImageResource(
-				getAttributeResourceId(
-					this@ActColumnList, Column.getIconAttrId(item.acct, item.type)
-				)
+			ivColumnIcon.setImageDrawable(
+				ContextCompat.getDrawable(this@ActColumnList,Column.getIconId(item.acct, item.type))?.also{
+					it.setTint( getAttributeColor(this@ActColumnList,R.attr.colorVectorDrawable))
+					it.setTintMode(PorterDuff.Mode.SRC_IN)
+				}
 			)
 			
 			dragView.findViewById<View>(R.id.ivBookmark).visibility =
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
index 5be7987c..d2eabeeb 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
@@ -1518,10 +1518,10 @@ class ActMain : AppCompatActivity()
 			
 			column.setHeaderBackground(viewRoot)
 			
-			setIconAttr(
+			setIconDrawableId(
 				this,
 				ivIcon,
-				column.getIconAttrId(column.column_type),
+				column.getIconId(column.column_type),
 				column.getHeaderNameColor()
 			)
 			
@@ -2427,15 +2427,10 @@ class ActMain : AppCompatActivity()
 		}
 		
 		c = footer_button_fg_color
-		if(c == 0) {
-			setIconAttr(this, btnToot, R.attr.ic_edit)
-			setIconAttr(this, btnMenu, R.attr.ic_hamburger)
-			setIconAttr(this, btnQuickToot, R.attr.btn_post)
-		} else {
-			setIconAttr(this, btnToot, R.attr.ic_edit, c)
-			setIconAttr(this, btnMenu, R.attr.ic_hamburger, c)
-			setIconAttr(this, btnQuickToot, R.attr.btn_post, c)
-		}
+		if(c == 0) c= getAttributeColor(this,R.attr.colorVectorDrawable)
+		setIconDrawableId(this, btnToot, R.drawable.ic_edit, c)
+		setIconDrawableId(this, btnMenu, R.drawable.ic_hamburger, c)
+		setIconDrawableId(this, btnQuickToot, R.drawable.ic_send, c)
 		
 		c = footer_tab_bg_color
 		if(c == 0) c = getAttributeColor(this, R.attr.colorColumnStripBackground)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
index 7c1225bd..70077dd6 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
@@ -30,6 +30,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.*
+import jp.juggler.subwaytooter.Styler.defaultColorIcon
 import jp.juggler.subwaytooter.api.*
 import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.dialog.*
@@ -191,9 +192,9 @@ class ActPost : AppCompatActivity(),
 			
 			// (Misskey) 返信を引用リノートにする
 			quotedRenote : Boolean = false,
-		
+			
 			//(Mastodon) 予約投稿の編集
-			scheduledStatus: TootScheduled? = null
+			scheduledStatus : TootScheduled? = null
 		
 		) {
 			val intent = Intent(activity, ActPost::class.java)
@@ -215,7 +216,7 @@ class ActPost : AppCompatActivity(),
 			if(sent_intent != null) {
 				intent.putExtra(KEY_SENT_INTENT, sent_intent)
 			}
-			if( scheduledStatus != null ){
+			if(scheduledStatus != null) {
 				intent.putExtra(KEY_SCHEDULED_STATUS, scheduledStatus.src.toString())
 			}
 			activity.startActivityForResult(intent, request_code)
@@ -263,7 +264,7 @@ class ActPost : AppCompatActivity(),
 	
 	private lateinit var llReply : View
 	private lateinit var tvReplyTo : TextView
-	private lateinit var btnRemoveReply : View
+	private lateinit var btnRemoveReply : ImageButton
 	private lateinit var ivReply : MyNetworkImageView
 	private lateinit var scrollView : ScrollView
 	
@@ -461,10 +462,10 @@ class ActPost : AppCompatActivity(),
 			this.visibility = TootVisibility.fromId(savedInstanceState.getInt(KEY_VISIBILITY, - 1))
 			
 			val a = account
-			if( a != null) {
+			if(a != null) {
 				savedInstanceState.getString(STATE_SCHEDULED_STATUS)?.let {
 					scheduledStatus =
-						parseItem(::TootScheduled, TootParser(this@ActPost, a), JSONObject(it),log)
+						parseItem(::TootScheduled, TootParser(this@ActPost, a), JSONObject(it), log)
 				}
 			}
 			
@@ -493,8 +494,7 @@ class ActPost : AppCompatActivity(),
 						sv.toJsonArray().forEach {
 							if(it !is JSONObject) return@forEach
 							try {
-								val a = TootAttachment.decodeJson(it)
-								attachment_list.add(PostAttachment(a))
+								attachment_list.add(PostAttachment(TootAttachment.decodeJson(it)))
 							} catch(ex : Throwable) {
 								log.trace(ex)
 							}
@@ -738,9 +738,14 @@ class ActPost : AppCompatActivity(),
 			// 予約編集の再編集
 			sv = intent.getStringExtra(KEY_SCHEDULED_STATUS)
 			if(sv != null && account != null) {
-				try{
-					val item = parseItem(::TootScheduled, TootParser(this@ActPost, account), JSONObject(sv),log)
-					if( item != null){
+				try {
+					val item = parseItem(
+						::TootScheduled,
+						TootParser(this@ActPost, account),
+						JSONObject(sv),
+						log
+					)
+					if(item != null) {
 						scheduledStatus = item
 						
 						timeSchedule = item.timeScheduledAt
@@ -749,34 +754,34 @@ class ActPost : AppCompatActivity(),
 						etContent.setText(text)
 						
 						val cw = item.spoiler_text
-						if( cw?.isNotEmpty() == true ){
+						if(cw?.isNotEmpty() == true) {
 							etContentWarning.setText(cw)
 							cbContentWarning.isChecked = true
-						}else{
+						} else {
 							cbContentWarning.isChecked = false
 						}
 						cbNSFW.isChecked = item.sensitive
 						visibility = item.visibility
-
+						
 						// 2019/1/7 どうも添付データを古い投稿から引き継げないようだ…。
 						// バグ臭い
-//						val src_attachments = item.media_attachments
-//						if(src_attachments?.isNotEmpty() == true) {
-//							app_state.attachment_list = this.attachment_list
-//							this.attachment_list.clear()
-//							try {
-//								for(src in src_attachments) {
-//									if(src is TootAttachment) {
-//										src.redraft = true
-//										val pa = PostAttachment(src)
-//										pa.status = PostAttachment.STATUS_UPLOADED
-//										this.attachment_list.add(pa)
-//									}
-//								}
-//							} catch(ex : Throwable) {
-//								log.trace(ex)
-//							}
-//						}
+						//						val src_attachments = item.media_attachments
+						//						if(src_attachments?.isNotEmpty() == true) {
+						//							app_state.attachment_list = this.attachment_list
+						//							this.attachment_list.clear()
+						//							try {
+						//								for(src in src_attachments) {
+						//									if(src is TootAttachment) {
+						//										src.redraft = true
+						//										val pa = PostAttachment(src)
+						//										pa.status = PostAttachment.STATUS_UPLOADED
+						//										this.attachment_list.add(pa)
+						//									}
+						//								}
+						//							} catch(ex : Throwable) {
+						//								log.trace(ex)
+						//							}
+						//						}
 					}
 				} catch(ex : Throwable) {
 					log.trace(ex)
@@ -794,7 +799,7 @@ class ActPost : AppCompatActivity(),
 			// 表示を未選択に更新
 			selectAccount(null)
 		}
-
+		
 		updateContentWarning()
 		showMediaAttachment()
 		showVisibility()
@@ -978,7 +983,7 @@ class ActPost : AppCompatActivity(),
 		
 		tvSchedule = findViewById(R.id.tvSchedule)
 		ibSchedule = findViewById(R.id.ibSchedule)
-		ibScheduleReset= findViewById(R.id.ibScheduleReset)
+		ibScheduleReset = findViewById(R.id.ibScheduleReset)
 		
 		ibSchedule.setOnClickListener(this)
 		ibScheduleReset.setOnClickListener(this)
@@ -1002,15 +1007,18 @@ class ActPost : AppCompatActivity(),
 		
 		for(iv in ivMedia) {
 			iv.setOnClickListener(this)
-			iv.setDefaultImageResId(getAttributeResourceId(this, R.attr.ic_loading))
-			iv.setErrorImageResId(getAttributeResourceId(this, R.attr.ic_unknown))
+			iv.setDefaultImage(defaultColorIcon(this, R.drawable.ic_upload))
+			iv.setErrorImage(defaultColorIcon(this, R.drawable.ic_unknown))
 		}
 		
-		setIcon(btnPost, R.drawable.btn_post)
-		setIcon(btnMore, R.drawable.btn_more)
-		setIcon(btnPlugin, R.drawable.ic_plugin)
-		setIcon(btnEmojiPicker, R.drawable.ic_face)
-		setIcon(btnAttachment, R.drawable.btn_attachment)
+		//		setIcon(btnPost, R.drawable.ic_send)
+		//		setIcon(btnMore, R.drawable.ic_more)
+		//		setIcon(btnPlugin, R.drawable.ic_extension)
+		//		setIcon(btnEmojiPicker, R.drawable.ic_face)
+		//		setIcon(btnAttachment, R.drawable.ic_attachment)
+		//		setIcon(ibSchedule, R.drawable.ic_edit)
+		//		setIcon(ibScheduleReset, R.drawable.ic_close)
+		//		setIcon(btnRemoveReply, R.drawable.ic_close)
 		
 		cbContentWarning.setOnCheckedChangeListener { _, _ ->
 			updateContentWarning()
@@ -1046,15 +1054,6 @@ class ActPost : AppCompatActivity(),
 		
 	}
 	
-	private fun setIcon(iv : ImageView, drawableId : Int) {
-		setIconDrawableId(
-			this,
-			iv,
-			drawableId,
-			getAttributeColor(this, R.attr.colorColumnHeaderName)
-		)
-	}
-	
 	private var lastInstanceTask : TootTaskRunner? = null
 	
 	private fun getMaxCharCount() : Int {
@@ -1188,7 +1187,7 @@ class ActPost : AppCompatActivity(),
 	
 	private fun performAccountChooser() {
 		
-		if( scheduledStatus!= null ) {
+		if(scheduledStatus != null) {
 			// 予約投稿の再編集ではアカウントを切り替えられない
 			showToast(this, false, R.string.cant_change_account_when_editing_scheduled_status)
 			return
@@ -2059,15 +2058,15 @@ class ActPost : AppCompatActivity(),
 		}
 	}
 	
-	private fun showVisibility() {
-		setIcon(
-			btnVisibility, Styler.getVisibilityIcon(
-				this
-				, account?.isMisskey == true
-				, visibility ?: TootVisibility.Public
-			)
-		)
-	}
+	private fun showVisibility() = setIconDrawableId(
+		this,
+		btnVisibility,
+		Styler.getVisibilityIconId(
+			account?.isMisskey == true
+			, visibility ?: TootVisibility.Public
+		),
+		getAttributeColor(this, R.attr.colorVectorDrawable)
+	)
 	
 	private fun performVisibility() {
 		val list = if(account?.isMisskey == true) {
@@ -2190,7 +2189,7 @@ class ActPost : AppCompatActivity(),
 		
 		post_helper.scheduledId = scheduledStatus?.id
 		
-		post_helper.post(account,callback=object:PostHelper.PostCompleteCallback{
+		post_helper.post(account, callback = object : PostHelper.PostCompleteCallback {
 			override fun onPostComplete(
 				target_account : SavedAccount,
 				status : TootStatus
@@ -2206,7 +2205,7 @@ class ActPost : AppCompatActivity(),
 			}
 			
 			override fun onScheduledPostComplete(target_account : SavedAccount) {
-				showToast(this@ActPost,false,getString(R.string.scheduled_status_sent))
+				showToast(this@ActPost, false, getString(R.string.scheduled_status_sent))
 				val data = Intent()
 				data.putExtra(EXTRA_POSTED_ACCT, target_account.acct)
 				setResult(RESULT_OK, data)
@@ -2677,8 +2676,8 @@ class ActPost : AppCompatActivity(),
 			showSchedule()
 		}
 	}
-
-	private fun resetSchedule(){
+	
+	private fun resetSchedule() {
 		timeSchedule = 0L
 		showSchedule()
 	}
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index 78265b8d..270b1720 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -293,42 +293,42 @@ class Column(
 			}
 		}
 		
-		internal fun getIconAttrId(acct : String, type : Int) : Int {
+		internal fun getIconId(acct : String, type : Int) : Int {
 			return when(type) {
-				TYPE_REPORTS -> R.attr.ic_info
-				TYPE_HOME -> R.attr.btn_home
+				TYPE_REPORTS -> R.drawable.ic_info
+				TYPE_HOME -> R.drawable.ic_home
 				
-				TYPE_LOCAL_AROUND -> R.attr.btn_local_tl
-				TYPE_FEDERATED_AROUND -> R.attr.btn_federate_tl
-				TYPE_ACCOUNT_AROUND -> R.attr.btn_statuses
+				TYPE_LOCAL_AROUND -> R.drawable.ic_run
+				TYPE_FEDERATED_AROUND -> R.drawable.ic_bike
+				TYPE_ACCOUNT_AROUND -> R.drawable.ic_account_box
 				
-				TYPE_LOCAL -> R.attr.btn_local_tl
-				TYPE_FEDERATE -> R.attr.btn_federate_tl
-				TYPE_MISSKEY_HYBRID -> R.attr.ic_share
+				TYPE_LOCAL -> R.drawable.ic_run
+				TYPE_FEDERATE -> R.drawable.ic_bike
+				TYPE_MISSKEY_HYBRID -> R.drawable.ic_share
 				
-				TYPE_PROFILE -> R.attr.btn_statuses
-				TYPE_FAVOURITES -> if(SavedAccount.isNicoru(acct)) R.attr.ic_nicoru else R.attr.btn_favourite
-				TYPE_NOTIFICATIONS -> R.attr.btn_notification
-				TYPE_CONVERSATION -> R.attr.ic_conversation
-				TYPE_BOOSTED_BY -> R.attr.btn_boost
-				TYPE_FAVOURITED_BY -> if(SavedAccount.isNicoru(acct)) R.attr.ic_nicoru else R.attr.btn_favourite
-				TYPE_HASHTAG -> R.attr.ic_hashtag
-				TYPE_MUTES -> R.attr.ic_mute
-				TYPE_KEYWORD_FILTER -> R.attr.ic_mute
-				TYPE_BLOCKS -> R.attr.ic_block
-				TYPE_DOMAIN_BLOCKS -> R.attr.ic_domain_block
-				TYPE_SEARCH, TYPE_SEARCH_MSP, TYPE_SEARCH_TS -> R.attr.ic_search
-				TYPE_INSTANCE_INFORMATION -> R.attr.ic_info
-				TYPE_FOLLOW_REQUESTS -> R.attr.ic_follow_wait
-				TYPE_FOLLOW_SUGGESTION -> R.attr.ic_follow_plus
-				TYPE_ENDORSEMENT -> R.attr.ic_follow_plus
-				TYPE_LIST_LIST -> R.attr.ic_list_list
-				TYPE_LIST_MEMBER -> R.attr.ic_list_member
-				TYPE_LIST_TL -> R.attr.ic_list_tl
-				TYPE_DIRECT_MESSAGES -> R.attr.ic_mail
-				TYPE_TREND_TAG -> R.attr.ic_hashtag
-				TYPE_SCHEDULED_STATUS -> R.attr.ic_timer
-				else -> R.attr.ic_info
+				TYPE_PROFILE -> R.drawable.ic_account_box
+				TYPE_FAVOURITES -> if(SavedAccount.isNicoru(acct)) R.drawable.ic_nicoru else R.drawable.ic_star
+				TYPE_NOTIFICATIONS -> R.drawable.ic_announcement
+				TYPE_CONVERSATION -> R.drawable.ic_forum
+				TYPE_BOOSTED_BY -> R.drawable.ic_repeat
+				TYPE_FAVOURITED_BY -> if(SavedAccount.isNicoru(acct)) R.drawable.ic_nicoru else R.drawable.ic_star
+				TYPE_HASHTAG -> R.drawable.ic_hashtag
+				TYPE_MUTES -> R.drawable.ic_volume_off
+				TYPE_KEYWORD_FILTER -> R.drawable.ic_volume_off
+				TYPE_BLOCKS -> R.drawable.ic_block
+				TYPE_DOMAIN_BLOCKS -> R.drawable.ic_cloud_off
+				TYPE_SEARCH, TYPE_SEARCH_MSP, TYPE_SEARCH_TS -> R.drawable.ic_search
+				TYPE_INSTANCE_INFORMATION -> R.drawable.ic_info
+				TYPE_FOLLOW_REQUESTS -> R.drawable.ic_follow_wait
+				TYPE_FOLLOW_SUGGESTION -> R.drawable.ic_follow_plus
+				TYPE_ENDORSEMENT -> R.drawable.ic_follow_plus
+				TYPE_LIST_LIST -> R.drawable.ic_list_list
+				TYPE_LIST_MEMBER -> R.drawable.ic_list_member
+				TYPE_LIST_TL -> R.drawable.ic_list_tl
+				TYPE_DIRECT_MESSAGES -> R.drawable.ic_mail
+				TYPE_TREND_TAG -> R.drawable.ic_hashtag
+				TYPE_SCHEDULED_STATUS -> R.drawable.ic_timer
+				else -> R.drawable.ic_info
 			}
 		}
 		
@@ -1096,8 +1096,8 @@ class Column(
 		}
 	}
 	
-	internal fun getIconAttrId(type : Int) : Int {
-		return getIconAttrId(access_info.acct, type)
+	internal fun getIconId(type : Int) : Int {
+		return getIconId(access_info.acct, type)
 	}
 	
 	// ブーストやお気に入りの更新に使う。ステータスを列挙する。
@@ -6444,10 +6444,6 @@ class Column(
 							s.markDeleted(context, ev.deletedAt) ?: false
 						}
 					}
-					
-					else -> {
-						log.d("onNoteUpdated: unknown type: ${ev.type}")
-					}
 				}
 				
 				if(changeList.isNotEmpty()) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt
index 655dd378..96221711 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt
@@ -760,15 +760,15 @@ class ColumnViewHolder(
 		// カラムヘッダ文字色(A)
 		var c = column.getHeaderNameColor()
 		tvColumnName.textColor = c
-		setIconAttr(
+		setIconDrawableId(
 			activity,
 			ivColumnIcon,
-			column.getIconAttrId(column.column_type),
+			column.getIconId(column.column_type),
 			c
 		)
-		setIconAttr(activity, btnColumnSetting, R.attr.ic_tune, c)
-		setIconAttr(activity, btnColumnReload, R.attr.btn_refresh, c)
-		setIconAttr(activity, btnColumnClose, R.attr.btn_close, c)
+		setIconDrawableId(activity, btnColumnSetting, R.drawable.ic_tune, c)
+		setIconDrawableId(activity, btnColumnReload, R.drawable.ic_refresh, c)
+		setIconDrawableId(activity, btnColumnClose, R.drawable.ic_close, c)
 		
 		// カラムヘッダ文字色(B)
 		c = column.getHeaderPageNumberColor()
@@ -1562,19 +1562,19 @@ class ColumnViewHolder(
 		
 		showQuickFilterButton(
 			btnQuickFilterMention,
-			R.drawable.btn_reply,
+			R.drawable.ic_reply,
 			column.quick_filter == Column.QUICK_FILTER_MENTION
 		)
 		
 		showQuickFilterButton(
 			btnQuickFilterFavourite,
-			R.drawable.btn_favourite,
+			R.drawable.ic_star,
 			column.quick_filter == Column.QUICK_FILTER_FAVOURITE
 		)
 		
 		showQuickFilterButton(
 			btnQuickFilterBoost,
-			R.drawable.btn_boost,
+			R.drawable.ic_repeat,
 			column.quick_filter == Column.QUICK_FILTER_BOOST
 		)
 		
diff --git a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt
index 021406a5..82c09c01 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/DlgContextMenu.kt
@@ -298,21 +298,16 @@ internal class DlgContextMenu(
 				ivFollowedBy.visibility = View.GONE
 			} else {
 				ivFollowedBy.visibility = View.VISIBLE
-				ivFollowedBy.setImageResource(
-					getAttributeResourceId(
-						activity,
-						R.attr.ic_followed_by
-					)
-				)
+				ivFollowedBy.setImageResource(R.drawable.ic_followed_by)
 			}
 			
 			btnFollow.setImageDrawable(
 				createColoredDrawable(
 					activity,
 					when {
-						relation.getRequested(who) -> R.drawable.ic_follow_wait_dark
-						relation.getFollowing(who) -> R.drawable.ic_follow_cross_dark
-						else -> R.drawable.ic_follow_plus_dark
+						relation.getRequested(who) -> R.drawable.ic_follow_wait
+						relation.getFollowing(who) -> R.drawable.ic_follow_cross
+						else -> R.drawable.ic_follow_plus
 					},
 					getAttributeColor(
 						activity,
@@ -328,7 +323,7 @@ internal class DlgContextMenu(
 			btnMute.setImageDrawable(
 				createColoredDrawable(
 					activity,
-					R.drawable.ic_mute_dark,
+					R.drawable.ic_volume_off,
 					getAttributeColor(
 						activity,
 						when(relation.muting) {
@@ -342,7 +337,7 @@ internal class DlgContextMenu(
 			btnBlock.setImageDrawable(
 				createColoredDrawable(
 					activity,
-					R.drawable.ic_block_dark,
+					R.drawable.ic_block,
 					getAttributeColor(
 						activity,
 						when(relation.blocking) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
index 8fc47ee4..e2abc0dc 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
@@ -19,6 +19,7 @@ import android.widget.*
 import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayout
 import com.google.android.flexbox.JustifyContent
+import jp.juggler.subwaytooter.Styler.defaultColorIcon
 import jp.juggler.subwaytooter.action.*
 import jp.juggler.subwaytooter.api.*
 import jp.juggler.subwaytooter.api.entity.*
@@ -33,7 +34,6 @@ import jp.juggler.util.*
 import org.jetbrains.anko.*
 import org.json.JSONObject
 import kotlin.math.max
-import kotlin.math.min
 
 internal class ItemViewHolder(
 	val activity : ActMain
@@ -266,7 +266,7 @@ internal class ItemViewHolder(
 		ivFollow.layoutParams.width = s
 		ivBoosted.layoutParams.width = s
 		
-		s = ActMain.replyIconSize + (activity.density*8).toInt()
+		s = ActMain.replyIconSize + (activity.density * 8).toInt()
 		ivReply.layoutParams.width = s
 		ivReply.layoutParams.height = s
 		
@@ -459,7 +459,7 @@ internal class ItemViewHolder(
 					item.hasAnyContent() -> {
 						// 引用Renote
 						showReply(
-							R.attr.btn_boost,
+							R.drawable.ic_repeat,
 							R.string.renote_to,
 							reblog
 						)
@@ -471,7 +471,7 @@ internal class ItemViewHolder(
 						showBoost(
 							item.accountRef,
 							item.time_created_at,
-							R.attr.btn_boost,
+							R.drawable.ic_repeat,
 							R.string.display_name_boosted_by
 						)
 						showStatusOrReply(item.reblog)
@@ -500,9 +500,10 @@ internal class ItemViewHolder(
 				showConversationIcons(item)
 			}
 			
-			is TootScheduled ->{
+			is TootScheduled -> {
 				showScheduled(item)
 			}
+			
 			else -> {
 			}
 		}
@@ -518,9 +519,9 @@ internal class ItemViewHolder(
 			
 			showStatusTimeScheduled(activity, tvTime, item)
 			
-			val who = access_info.loginAccount!!
+			val who = access_info.loginAccount !!
 			val whoRef = TootAccountRef(TootParser(activity, access_info), who)
-			this.status_account =whoRef
+			this.status_account = whoRef
 			
 			setAcct(tvAcct, access_info.getFullAcct(who), who.acct)
 			
@@ -533,26 +534,23 @@ internal class ItemViewHolder(
 				access_info.supplyBaseUrl(who.avatar)
 			)
 			
-			val content = SpannableString(item.text?:"")
+			val content = SpannableString(item.text ?: "")
 			
 			tvMentions.visibility = View.GONE
 			
 			tvContent.text = content
 			content_invalidator.register(content)
 			
-			tvContent.minLines = -1
+			tvContent.minLines = - 1
 			
-			
-			
-			
-			val decoded_spoiler_text = SpannableString(item.spoiler_text?:"")
+			val decoded_spoiler_text = SpannableString(item.spoiler_text ?: "")
 			when {
 				decoded_spoiler_text.isNotEmpty() -> {
 					// 元データに含まれるContent Warning を使う
 					llContentWarning.visibility = View.VISIBLE
 					tvContentWarning.text = decoded_spoiler_text
 					spoiler_invalidator.register(decoded_spoiler_text)
-					val cw_shown = ContentWarning.isShown(item.uri,false)
+					val cw_shown = ContentWarning.isShown(item.uri, false)
 					showContent(cw_shown)
 				}
 				
@@ -564,7 +562,7 @@ internal class ItemViewHolder(
 			}
 			
 			val media_attachments = item.media_attachments
-			if(media_attachments?.isEmpty() != false ) {
+			if(media_attachments?.isEmpty() != false) {
 				flMedia.visibility = View.GONE
 				llMedia.visibility = View.GONE
 				btnShowMedia.visibility = View.GONE
@@ -577,7 +575,7 @@ internal class ItemViewHolder(
 					access_info.dont_hide_nsfw -> true
 					else -> ! item.sensitive
 				}
-				val is_shown =  MediaShown.isShown(item.uri, default_shown)
+				val is_shown = MediaShown.isShown(item.uri, default_shown)
 				
 				btnShowMedia.visibility = if(! is_shown) View.VISIBLE else View.GONE
 				llMedia.visibility = if(! is_shown) View.GONE else View.VISIBLE
@@ -591,10 +589,10 @@ internal class ItemViewHolder(
 					tvMediaDescription.text = sb
 				}
 				
-				setIconAttr(
+				setIconDrawableId(
 					activity,
 					btnHideMedia,
-					R.attr.btn_close,
+					R.drawable.ic_close,
 					color = content_color,
 					alphaMultiplier = Styler.boost_alpha
 				)
@@ -603,16 +601,17 @@ internal class ItemViewHolder(
 			buttons_for_status?.hide()
 			
 			tvApplication.visibility = View.GONE
-
-		}catch(ex:Throwable){
+			
+		} catch(ex : Throwable) {
 		
 		}
 		llSearchTag.visibility = View.VISIBLE
-		btnSearchTag.text = activity.getString(R.string.scheduled_status) + " "+ TootStatus.formatTime(
-			activity,
-			item.timeScheduledAt,
-			true
-		)
+		btnSearchTag.text = activity.getString(R.string.scheduled_status) + " " +
+			TootStatus.formatTime(
+				activity,
+				item.timeScheduledAt,
+				true
+			)
 	}
 	
 	private fun removeExtraView() {
@@ -705,14 +704,14 @@ internal class ItemViewHolder(
 		when {
 			reply != null ->
 				showReply(
-					R.attr.btn_reply,
+					R.drawable.ic_reply,
 					R.string.reply_to,
 					reply
 				)
 			
 			in_reply_to_id != null && in_reply_to_account_id != null -> {
 				showReply(
-					R.attr.btn_reply,
+					R.drawable.ic_reply,
 					in_reply_to_account_id,
 					item
 				)
@@ -755,7 +754,7 @@ internal class ItemViewHolder(
 				else -> {
 					// 引用Renote
 					showReply(
-						R.attr.btn_boost,
+						R.drawable.ic_repeat,
 						R.string.renote_to,
 						reblog
 					)
@@ -770,7 +769,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					if(access_info.isNicoru(n_account)) R.attr.ic_nicoru else R.attr.btn_favourite,
+					if(access_info.isNicoru(n_account)) R.drawable.ic_nicoru else R.drawable.ic_star,
 					R.string.display_name_favourited_by
 				)
 				if(n_status != null) {
@@ -782,7 +781,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.btn_boost,
+					R.drawable.ic_repeat,
 					R.string.display_name_boosted_by
 				)
 				if(n_status != null) {
@@ -796,7 +795,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.btn_boost,
+					R.drawable.ic_repeat,
 					R.string.display_name_boosted_by
 				)
 				if(n_status != null) {
@@ -809,7 +808,7 @@ internal class ItemViewHolder(
 					showBoost(
 						n_accountRef,
 						n.time_created_at,
-						R.attr.ic_follow_plus,
+						R.drawable.ic_follow_plus,
 						R.string.display_name_followed_by
 					)
 					showAccount(n_accountRef)
@@ -821,7 +820,7 @@ internal class ItemViewHolder(
 					showBoost(
 						n_accountRef,
 						n.time_created_at,
-						R.attr.ic_follow_cross,
+						R.drawable.ic_follow_cross,
 						R.string.display_name_unfollowed_by
 					)
 					showAccount(n_accountRef)
@@ -842,7 +841,7 @@ internal class ItemViewHolder(
 							showBoost(
 								n_accountRef,
 								n.time_created_at,
-								R.attr.btn_reply,
+								R.drawable.ic_reply,
 								R.string.display_name_mentioned_by
 							)
 						}
@@ -858,7 +857,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.ic_question, // not used
+					R.drawable.ic_question, // not used
 					R.string.display_name_reaction_by
 					, reactionDrawableId = reaction?.btnDrawableId
 				)
@@ -871,7 +870,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.btn_boost,
+					R.drawable.ic_repeat,
 					R.string.display_name_quoted_by
 				)
 				if(n_status != null) {
@@ -883,7 +882,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.ic_vote,
+					R.drawable.ic_vote,
 					R.string.display_name_voted_by
 				)
 				if(n_status != null) {
@@ -895,7 +894,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.ic_follow_wait,
+					R.drawable.ic_follow_wait,
 					R.string.display_name_follow_request_by
 				)
 				boostedAction = {
@@ -911,7 +910,7 @@ internal class ItemViewHolder(
 				if(n_account != null) showBoost(
 					n_accountRef,
 					n.time_created_at,
-					R.attr.ic_question,
+					R.drawable.ic_question,
 					R.string.unknown_notification_from
 				)
 				if(n_status != null) {
@@ -973,15 +972,15 @@ internal class ItemViewHolder(
 	}
 	
 	private fun showReply(
-		iconAttrId : Int,
+		iconId : Int,
 		text : Spannable
 	) {
 		llReply.visibility = View.VISIBLE
 		
-		setIconAttr(
+		setIconDrawableId(
 			activity,
 			ivReply,
-			iconAttrId,
+			iconId,
 			color = content_color,
 			alphaMultiplier = Styler.boost_alpha
 		)
@@ -991,7 +990,7 @@ internal class ItemViewHolder(
 	}
 	
 	private fun showReply(
-		iconAttrId : Int,
+		iconId : Int,
 		stringId : Int,
 		reply : TootStatus
 	) {
@@ -1002,11 +1001,11 @@ internal class ItemViewHolder(
 		// setAcct(tvReplyAcct, access_info.getFullAcct(who), who.acct)
 		
 		val text = reply.accountRef.decoded_display_name.intoStringResource(activity, stringId)
-		showReply(iconAttrId, text)
+		showReply(iconId, text)
 	}
 	
 	private fun showReply(
-		iconAttrId : Int,
+		iconId : Int,
 		accountId : EntityId,
 		replyStatus : TootStatus
 	) {
@@ -1029,13 +1028,13 @@ internal class ItemViewHolder(
 		// showStatusTime(activity, tvReplyTime, who, time = reply.time_created_at)
 		// setAcct(tvReplyAcct, access_info.getFullAcct(who), who.acct)
 		
-		showReply(iconAttrId, text)
+		showReply(iconId, text)
 	}
 	
 	private fun showBoost(
 		whoRef : TootAccountRef,
 		time : Long,
-		icon_attr_id : Int,
+		iconId : Int,
 		string_id : Int,
 		reactionDrawableId : Int? = null
 	) {
@@ -1053,10 +1052,10 @@ internal class ItemViewHolder(
 		if(reactionDrawableId != null) {
 			setIconDrawableId(activity, ivBoosted, reactionDrawableId)
 		} else {
-			setIconAttr(
+			setIconDrawableId(
 				activity,
 				ivBoosted,
-				icon_attr_id,
+				iconId,
 				color = content_color,
 				alphaMultiplier = Styler.boost_alpha
 			)
@@ -1271,10 +1270,10 @@ internal class ItemViewHolder(
 				tvMediaDescription.text = sb
 			}
 			
-			setIconAttr(
+			setIconDrawableId(
 				activity,
 				btnHideMedia,
-				R.attr.btn_close,
+				R.drawable.ic_close,
 				color = content_color,
 				alphaMultiplier = Styler.boost_alpha
 			)
@@ -1408,13 +1407,13 @@ internal class ItemViewHolder(
 			}
 			
 			// visibility
-			val visIconAttrId =
-				Styler.getVisibilityIconAttr(access_info.isMisskey, status.visibility)
-			if(R.attr.ic_public != visIconAttrId) {
+			val visIconId =
+				Styler.getVisibilityIconId(access_info.isMisskey, status.visibility)
+			if(R.drawable.ic_public != visIconId) {
 				if(sb.isNotEmpty()) sb.append('\u200B')
 				sb.appendColorShadeIcon(
 					activity,
-					getAttributeResourceId(activity, visIconAttrId),
+					visIconId,
 					Styler.getVisibilityString(
 						activity,
 						access_info.isMisskey,
@@ -1486,28 +1485,28 @@ internal class ItemViewHolder(
 	) {
 		val sb = SpannableStringBuilder()
 		
-			// NSFWマーク
-			if(item.hasMedia() && item.sensitive) {
-				if(sb.isNotEmpty()) sb.append('\u200B')
-				sb.appendColorShadeIcon(activity, R.drawable.ic_eye_off, "NSFW")
-			}
-			
-			// visibility
-			val visIconAttrId =
-				Styler.getVisibilityIconAttr(access_info.isMisskey, item.visibility )
-			if(R.attr.ic_public != visIconAttrId) {
-				if(sb.isNotEmpty()) sb.append('\u200B')
-				sb.appendColorShadeIcon(
+		// NSFWマーク
+		if(item.hasMedia() && item.sensitive) {
+			if(sb.isNotEmpty()) sb.append('\u200B')
+			sb.appendColorShadeIcon(activity, R.drawable.ic_eye_off, "NSFW")
+		}
+		
+		// visibility
+		val visIconId =
+			Styler.getVisibilityIconId(access_info.isMisskey, item.visibility)
+		if(R.drawable.ic_public != visIconId) {
+			if(sb.isNotEmpty()) sb.append('\u200B')
+			sb.appendColorShadeIcon(
+				activity,
+				visIconId,
+				Styler.getVisibilityString(
 					activity,
-					getAttributeResourceId(activity, visIconAttrId),
-					Styler.getVisibilityString(
-						activity,
-						access_info.isMisskey,
-						item.visibility
-					)
+					access_info.isMisskey,
+					item.visibility
 				)
-			}
-			
+			)
+		}
+		
 		
 		if(sb.isNotEmpty()) sb.append(' ')
 		sb.append(
@@ -1591,13 +1590,13 @@ internal class ItemViewHolder(
 		when(ta.type) {
 			TootAttachmentLike.TYPE_AUDIO -> {
 				iv.setMediaType(0)
-				iv.setDefaultImageResId(getAttributeResourceId(activity, R.attr.ic_music))
+				iv.setDefaultImage(defaultColorIcon(activity,R.drawable.wide_music))
 				iv.setImageUrl(activity.pref, 0f, null)
 			}
 			
 			TootAttachmentLike.TYPE_UNKNOWN -> {
 				iv.setMediaType(0)
-				iv.setDefaultImageResId(getAttributeResourceId(activity, R.attr.ic_question))
+				iv.setDefaultImage(defaultColorIcon(activity,R.drawable.wide_question))
 				iv.setImageUrl(activity.pref, 0f, null)
 			}
 			
@@ -1606,12 +1605,7 @@ internal class ItemViewHolder(
 				when {
 					url?.isEmpty() != false -> {
 						iv.setMediaType(0)
-						iv.setDefaultImageResId(
-							getAttributeResourceId(
-								activity,
-								R.attr.ic_question
-							)
-						)
+						iv.setDefaultImage(defaultColorIcon(activity,R.drawable.wide_question))
 						iv.setImageUrl(activity.pref, 0f, null)
 					}
 					
@@ -1623,7 +1617,7 @@ internal class ItemViewHolder(
 								else -> 0
 							}
 						)
-						iv.setDefaultImageResId(0)
+						iv.setDefaultImage(null)
 						iv.setImageUrl(
 							activity.pref,
 							0f,
@@ -1666,7 +1660,7 @@ internal class ItemViewHolder(
 		val notification = (item as? TootNotification)
 		boost_account?.let { whoRef ->
 			if(access_info.isPseudo) {
-				DlgContextMenu(activity, column, whoRef, null, notification,tvContent).show()
+				DlgContextMenu(activity, column, whoRef, null, notification, tvContent).show()
 			} else {
 				Action_User.profileLocal(activity, pos, access_info, whoRef.get())
 			}
@@ -1687,21 +1681,21 @@ internal class ItemViewHolder(
 					btnShowMedia.visibility = View.VISIBLE
 					llMedia.visibility = View.GONE
 				}
-				(item as? TootScheduled)?.let{ item ->
+				if( item is TootScheduled){
 					MediaShown.save(item.uri, false)
 					btnShowMedia.visibility = View.VISIBLE
 					llMedia.visibility = View.GONE
 				}
 			}
 			
-			btnShowMedia ->{
+			btnShowMedia -> {
 				
 				status_showing?.let { status ->
 					MediaShown.save(status, true)
 					btnShowMedia.visibility = View.GONE
 					llMedia.visibility = View.VISIBLE
 				}
-				(item as? TootScheduled)?.let{ item ->
+				if( item is TootScheduled){
 					MediaShown.save(item.uri, true)
 					btnShowMedia.visibility = View.GONE
 					llMedia.visibility = View.VISIBLE
@@ -1713,7 +1707,7 @@ internal class ItemViewHolder(
 			ivMedia3 -> clickMedia(2)
 			ivMedia4 -> clickMedia(3)
 			
-			btnContentWarning ->{
+			btnContentWarning -> {
 				status_showing?.let { status ->
 					val new_shown = llContents.visibility == View.GONE
 					ContentWarning.save(status, new_shown)
@@ -1722,7 +1716,7 @@ internal class ItemViewHolder(
 					list_adapter.notifyChange(reason = "ContentWarning onClick", reset = true)
 					
 				}
-				(item as? TootScheduled)?.let{ item ->
+				if(item is TootScheduled){
 					val new_shown = llContents.visibility == View.GONE
 					ContentWarning.save(item.uri, new_shown)
 					
@@ -1769,14 +1763,14 @@ internal class ItemViewHolder(
 			
 			llFollow -> follow_account?.let { whoRef ->
 				if(access_info.isPseudo) {
-					DlgContextMenu(activity, column, whoRef, null, notification,tvContent).show()
+					DlgContextMenu(activity, column, whoRef, null, notification, tvContent).show()
 				} else {
 					Action_User.profileLocal(activity, pos, access_info, whoRef.get())
 				}
 			}
 			
 			btnFollow -> follow_account?.let { who ->
-				DlgContextMenu(activity, column, who, null, notification,tvContent).show()
+				DlgContextMenu(activity, column, who, null, notification, tvContent).show()
 			}
 			
 			btnSearchTag, llTrendTag -> when(item) {
@@ -1810,16 +1804,16 @@ internal class ItemViewHolder(
 					)
 				}
 				
-				is TootScheduled ->{
+				is TootScheduled -> {
 					ActionsDialog()
-						.addAction(activity.getString(R.string.delete)){
-							Action_Toot.deleteScheduledPost(activity,access_info,item){
+						.addAction(activity.getString(R.string.delete)) {
+							Action_Toot.deleteScheduledPost(activity, access_info, item) {
 								column.onScheduleDeleted(item)
-								showToast(activity,false,R.string.scheduled_post_deleted)
+								showToast(activity, false, R.string.scheduled_post_deleted)
 							}
 						}
-						.addAction(activity.getString(R.string.edit)){
-							Action_Toot.editScheduledPost(activity,access_info,item)
+						.addAction(activity.getString(R.string.edit)) {
+							Action_Toot.editScheduledPost(activity, access_info, item)
 						}
 						.show(activity)
 				}
@@ -2035,7 +2029,9 @@ internal class ItemViewHolder(
 	
 	private fun clickMedia(i : Int) {
 		try {
-			val media_attachments = status_showing?.media_attachments ?: (item as? TootScheduled)?.media_attachments ?: return
+			val media_attachments =
+				status_showing?.media_attachments ?: (item as? TootScheduled)?.media_attachments
+				?: return
 			val item = if(i < media_attachments.size) media_attachments[i] else return
 			when(item) {
 				is TootAttachmentMSP -> {
@@ -2770,7 +2766,7 @@ internal class ItemViewHolder(
 							ivReply = imageView {
 								scaleType = ImageView.ScaleType.FIT_END
 								importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
-								padding=dip(4)
+								padding = dip(4)
 							}.lparams(dip(32), dip(32)) {
 								endMargin = dip(4)
 							}
@@ -2848,11 +2844,7 @@ internal class ItemViewHolder(
 												R.drawable.btn_bg_transparent
 											)
 											contentDescription = "@string/hide"
-											imageResource =
-												getAttributeResourceId(
-													context,
-													R.attr.btn_close
-												)
+											imageResource = R.drawable.ic_close
 										}.lparams(dip(32), dip(32)) {
 											gravity = Gravity.END
 										}
@@ -3005,11 +2997,7 @@ internal class ItemViewHolder(
 												R.drawable.btn_bg_transparent
 											)
 											contentDescription = "@string/hide"
-											imageResource =
-												getAttributeResourceId(
-													context,
-													R.attr.btn_close
-												)
+											imageResource = R.drawable.ic_close
 										}.lparams(dip(32), matchParent) {
 											startMargin = dip(8)
 										}
@@ -3023,11 +3011,10 @@ internal class ItemViewHolder(
 										)
 										gravity = Gravity.CENTER
 										text = context.getString(R.string.tap_to_show)
-										textColor =
-											getAttributeColor(
-												context,
-												R.attr.colorShowMediaText
-											)
+										textColor = getAttributeColor(
+											context,
+											R.attr.colorShowMediaText
+										)
 										
 									}.lparams(matchParent, matchParent)
 								}
@@ -3188,7 +3175,7 @@ internal class ItemViewHolder(
 					
 					background =
 						ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent)
-					imageResource = getAttributeResourceId(context, R.attr.btn_more)
+					imageResource = R.drawable.ic_more
 					contentDescription = context.getString(R.string.more)
 				}.lparams(dip(40), dip(40)) {
 					startMargin = dip(4)
@@ -3209,7 +3196,7 @@ internal class ItemViewHolder(
 					background =
 						ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent)
 					contentDescription = context.getString(R.string.follow_accept)
-					imageResource = getAttributeResourceId(context, R.attr.ic_check)
+					imageResource = R.drawable.ic_check
 					setPadding(0, 0, 0, 0)
 				}.lparams(dip(48f), dip(32f))
 				
@@ -3217,7 +3204,7 @@ internal class ItemViewHolder(
 					background =
 						ContextCompat.getDrawable(context, R.drawable.btn_bg_transparent)
 					contentDescription = context.getString(R.string.follow_deny)
-					imageResource = getAttributeResourceId(context, R.attr.btn_close)
+					imageResource = R.drawable.ic_close
 					setPadding(0, 0, 0, 0)
 				}.lparams(dip(48f), dip(32f)) {
 					startMargin = dip(4)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
index f8a0ac8d..8f75e5b1 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.kt
@@ -421,11 +421,11 @@ object Pref {
 	val spAutoCWLines = StringPref("auto_cw_lines", "0")
 	val spCardDescriptionLength = StringPref("CardDescriptionLength", "64")
 	val spAvatarIconSize = StringPref("avatar_icon_size", "48")
-	val spNotificationTlIconSize = StringPref("notification_tl_icon_size", "32")
+	val spNotificationTlIconSize = StringPref("notification_tl_icon_size", "24")
 	val spBoostButtonSize = StringPref("BoostButtonSize", "35")
 	val spReplyIconSize = StringPref("ReplyIconSize", "24")
-	val spHeaderIconSize = StringPref("HeaderIconSize", "32")
-	val spStripIconSize = StringPref("StripIconSize", "32")
+	val spHeaderIconSize = StringPref("HeaderIconSize", "24")
+	val spStripIconSize = StringPref("StripIconSize", "24")
 	val spMediaSizeMax = StringPref("max_media_size", "8")
 	val spMovieSizeMax = StringPref("max_movie_size", "40")
 	val spTimelineFont = StringPref("timeline_font", "", skipImport = true)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
index 68706ee0..106d5fde 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/StatusButtons.kt
@@ -75,7 +75,6 @@ internal class StatusButtons(
 		btnReply.setOnLongClickListener(this)
 	}
 	
-
 	fun hide() {
 		holder.viewRoot.visibility = View.GONE
 	}
@@ -86,8 +85,8 @@ internal class StatusButtons(
 		this.notification = notification
 		
 		val fav_icon_drawable = when {
-			access_info.isNicoru(status.account) -> R.drawable.ic_nicoru_dark
-			else -> R.drawable.btn_favourite_dark
+			access_info.isNicoru(status.account) -> R.drawable.ic_nicoru
+			else -> R.drawable.ic_star
 		}
 		
 		val replies_count = status.replies_count
@@ -95,35 +94,35 @@ internal class StatusButtons(
 		setIconDrawableId(
 			activity,
 			btnConversation,
-			R.drawable.ic_conversation_dark,
+			R.drawable.ic_forum,
 			color = color_normal,
 			alphaMultiplier = Styler.boost_alpha
 		)
 		setIconDrawableId(
 			activity,
 			btnMore,
-			R.drawable.btn_more_dark,
+			R.drawable.ic_more,
 			color = color_normal,
 			alphaMultiplier = Styler.boost_alpha
 		)
 		
-//		val a = (((color_normal ushr 24)/255f) * 0.7f)
-
+		//		val a = (((color_normal ushr 24)/255f) * 0.7f)
+		
 		// setIconDrawableId で色を指定するとアルファ値も反映されるらしい
-//		btnConversation.alpha = a
-//		btnMore.alpha = a
-//
-//		btnReply.alpha = a
-//		btnBoost.alpha = a
-//		btnFavourite.alpha = a
-//		btnFollow2.alpha = a
-//		ivFollowedBy2.alpha = a
+		//		btnConversation.alpha = a
+		//		btnMore.alpha = a
+		//
+		//		btnReply.alpha = a
+		//		btnBoost.alpha = a
+		//		btnFavourite.alpha = a
+		//		btnFollow2.alpha = a
+		//		ivFollowedBy2.alpha = a
 		
 		setButton(
 			btnReply,
 			true,
 			color_normal,
-			R.drawable.btn_reply_dark,
+			R.drawable.ic_reply,
 			when(replies_count) {
 				null -> ""
 				else -> when(Pref.ipRepliesCount(activity.pref)) {
@@ -146,7 +145,7 @@ internal class StatusButtons(
 				btnBoost,
 				false,
 				color_accent,
-				R.drawable.ic_mail_dark,
+				R.drawable.ic_repeat,
 				"",
 				activity.getString(R.string.boost)
 			)
@@ -155,7 +154,7 @@ internal class StatusButtons(
 				btnBoost,
 				false,
 				color_normal,
-				R.drawable.btn_refresh_dark,
+				R.drawable.ic_refresh,
 				"?",
 				activity.getString(R.string.boost)
 			)
@@ -164,7 +163,7 @@ internal class StatusButtons(
 				btnBoost,
 				true,
 				if(status.reblogged) color_accent else color_normal,
-				R.drawable.btn_boost_dark,
+				R.drawable.ic_repeat,
 				status.reblogs_count?.toString() ?: "",
 				activity.getString(R.string.boost)
 			)
@@ -175,7 +174,7 @@ internal class StatusButtons(
 				btnFavourite,
 				false,
 				color_normal,
-				R.drawable.btn_refresh_dark,
+				R.drawable.ic_refresh,
 				"?",
 				activity.getString(R.string.favourite)
 			)
@@ -220,7 +219,8 @@ internal class StatusButtons(
 		count : String,
 		contentDescription : String
 	) {
-		val d = createColoredDrawable(activity,drawableId,color,alphaMultiplier = Styler.boost_alpha)
+		val d =
+			createColoredDrawable(activity, drawableId, color, alphaMultiplier = Styler.boost_alpha)
 		b.setImageDrawable(d)
 		b.setPaddingAndText(holder.paddingH, holder.paddingV, count, 14f, holder.compoundPaddingDp)
 		b.setTextColor(color.applyAlphaMultiplier(Styler.boost_alpha))
@@ -418,7 +418,6 @@ internal class StatusButtons(
 		return true
 	}
 	
-	
 }
 
 open class _FlexboxLayout(ctx : Context) : FlexboxLayout(ctx) {
@@ -481,8 +480,7 @@ class StatusButtonsViewHolder(
 					
 					setPadding(paddingH, paddingV, paddingH, paddingV)
 					scaleType = ImageView.ScaleType.FIT_CENTER
-					imageResource =
-						getAttributeResourceId(context, R.attr.ic_conversation)
+					imageResource = R.drawable.ic_forum
 				}.lparams(buttonHeight, buttonHeight)
 				
 				btnReply = customView<CountImageButton> {
@@ -560,8 +558,7 @@ class StatusButtonsViewHolder(
 					scaleType = ImageView.ScaleType.FIT_CENTER
 					
 					contentDescription = context.getString(R.string.more)
-					imageResource =
-						getAttributeResourceId(context, R.attr.btn_more)
+					imageResource = R.drawable.ic_more
 				}.lparams(buttonHeight, buttonHeight) {
 					startMargin = marginBetween
 				}
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Styler.kt b/app/src/main/java/jp/juggler/subwaytooter/Styler.kt
index 220c6af9..dc473833 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Styler.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Styler.kt
@@ -1,10 +1,9 @@
 package jp.juggler.subwaytooter
 
 import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.drawable.*
-import android.graphics.drawable.shapes.RectShape
-import android.os.Build
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.support.v4.content.ContextCompat
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.view.View
@@ -19,7 +18,13 @@ import jp.juggler.util.*
 
 object Styler {
 	
-	fun getVisibilityIconAttr(isMisskeyData : Boolean, visibility : TootVisibility) : Int {
+	fun defaultColorIcon(context : Context, iconId : Int) : Drawable? =
+		ContextCompat.getDrawable(context, iconId)?.also {
+			it.setTint(getAttributeColor(context, R.attr.colorVectorDrawable))
+			it.setTintMode(PorterDuff.Mode.SRC_IN)
+		}
+	
+	fun getVisibilityIconId(isMisskeyData : Boolean, visibility : TootVisibility) : Int {
 		val isMisskey = when(Pref.ipVisibilityStyle(App1.pref)) {
 			Pref.VS_MASTODON -> false
 			Pref.VS_MISSKEY -> true
@@ -27,42 +32,34 @@ object Styler {
 		}
 		return when {
 			isMisskey -> when(visibility) {
-				TootVisibility.Public -> R.attr.ic_public
-				TootVisibility.UnlistedHome -> R.attr.btn_home
-				TootVisibility.PrivateFollowers -> R.attr.ic_lock_open
-				TootVisibility.DirectSpecified -> R.attr.ic_mail
-				TootVisibility.DirectPrivate -> R.attr.ic_lock
-				TootVisibility.WebSetting -> R.attr.ic_question
+				TootVisibility.Public -> R.drawable.ic_public
+				TootVisibility.UnlistedHome -> R.drawable.ic_home
+				TootVisibility.PrivateFollowers -> R.drawable.ic_lock_open
+				TootVisibility.DirectSpecified -> R.drawable.ic_mail
+				TootVisibility.DirectPrivate -> R.drawable.ic_lock
+				TootVisibility.WebSetting -> R.drawable.ic_question
 				
-				TootVisibility.LocalPublic -> R.attr.ic_local_ltl
-				TootVisibility.LocalHome -> R.attr.ic_local_home
-				TootVisibility.LocalFollowers -> R.attr.ic_local_lock_open
+				TootVisibility.LocalPublic -> R.drawable.ic_local_ltl
+				TootVisibility.LocalHome -> R.drawable.ic_local_home
+				TootVisibility.LocalFollowers -> R.drawable.ic_local_lock_open
 				
 			}
 			else -> when(visibility) {
-				TootVisibility.Public -> R.attr.ic_public
-				TootVisibility.UnlistedHome -> R.attr.ic_lock_open
-				TootVisibility.PrivateFollowers -> R.attr.ic_lock
-				TootVisibility.DirectSpecified -> R.attr.ic_mail
-				TootVisibility.DirectPrivate -> R.attr.ic_mail
-				TootVisibility.WebSetting -> R.attr.ic_question
+				TootVisibility.Public -> R.drawable.ic_public
+				TootVisibility.UnlistedHome -> R.drawable.ic_lock_open
+				TootVisibility.PrivateFollowers -> R.drawable.ic_lock
+				TootVisibility.DirectSpecified -> R.drawable.ic_mail
+				TootVisibility.DirectPrivate -> R.drawable.ic_mail
+				TootVisibility.WebSetting -> R.drawable.ic_question
 				
-				TootVisibility.LocalPublic -> R.attr.ic_local_ltl
-				TootVisibility.LocalHome -> R.attr.ic_local_lock_open
-				TootVisibility.LocalFollowers -> R.attr.ic_local_lock
+				TootVisibility.LocalPublic -> R.drawable.ic_local_ltl
+				TootVisibility.LocalHome -> R.drawable.ic_local_lock_open
+				TootVisibility.LocalFollowers -> R.drawable.ic_local_lock
 				
 			}
 		}
 	}
 	
-	fun getVisibilityIcon(
-		context : Context,
-		isMisskeyData : Boolean,
-		visibility : TootVisibility
-	) : Int {
-		return getAttributeResourceId(context, getVisibilityIconAttr(isMisskeyData, visibility))
-	}
-	
 	fun getVisibilityString(
 		context : Context,
 		isMisskeyData : Boolean,
@@ -110,16 +107,26 @@ object Styler {
 		visibility : TootVisibility
 	) : CharSequence {
 		
-		val icon_id = getVisibilityIcon(context, isMisskeyData, visibility)
+		val icon_id = getVisibilityIconId(isMisskeyData, visibility)
 		val sv = getVisibilityString(context, isMisskeyData, visibility)
-		
+		val color = getAttributeColor(context, R.attr.colorVectorDrawable)
 		val sb = SpannableStringBuilder()
 		
 		// アイコン部分
 		val start = sb.length
 		sb.append(" ")
 		val end = sb.length
-		sb.setSpan(EmojiImageSpan(context, icon_id), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+		sb.setSpan(
+			EmojiImageSpan(
+				context,
+				icon_id,
+				useColorShader = true,
+				color = color
+			),
+			start,
+			end,
+			Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+		)
 		
 		// 文字列部分
 		sb.append(' ')
@@ -168,10 +175,10 @@ object Styler {
 			
 			relation.followed_by -> {
 				ivDot.visibility = View.VISIBLE
-				setIconAttr(
+				setIconDrawableId(
 					context,
 					ivDot,
-					R.attr.ic_followed_by,
+					R.drawable.ic_followed_by,
 					color = colorAccent(),
 					alphaMultiplier = alphaMultiplier
 				)
@@ -188,46 +195,51 @@ object Styler {
 		// フォローボタン
 		// follow button
 		val color : Int
-		val icon_attr : Int
+		val iconId : Int
 		val contentDescription : String
 		
 		when {
 			relation.blocking -> {
-				icon_attr = R.attr.ic_block
+				iconId = R.drawable.ic_block
 				color = defaultColor
 				contentDescription = context.getString(R.string.follow)
 			}
 			
 			relation.muting -> {
-				icon_attr = R.attr.ic_mute
+				iconId = R.drawable.ic_volume_off
 				color = defaultColor
 				contentDescription = context.getString(R.string.follow)
 			}
 			
 			relation.getFollowing(who) -> {
-				icon_attr = R.attr.ic_follow_cross
+				iconId = R.drawable.ic_follow_cross
 				color = colorAccent()
 				contentDescription = context.getString(R.string.unfollow)
 			}
 			
 			relation.getRequested(who) -> {
-				icon_attr = R.attr.ic_follow_wait
+				iconId = R.drawable.ic_follow_wait
 				color = colorError()
 				contentDescription = context.getString(R.string.unfollow)
 			}
 			
 			else -> {
-				icon_attr = R.attr.ic_follow_plus
+				iconId = R.drawable.ic_follow_plus
 				color = defaultColor
 				contentDescription = context.getString(R.string.follow)
 			}
 		}
 		
-		setIconAttr(context, ibFollow, icon_attr, color = color, alphaMultiplier = alphaMultiplier)
+		setIconDrawableId(
+			context,
+			ibFollow,
+			iconId,
+			color = color,
+			alphaMultiplier = alphaMultiplier
+		)
 		ibFollow.contentDescription = contentDescription
 	}
 	
-
 	private fun getHorizontalPadding(v : View, delta_dp : Float) : Int {
 		val form_width_max = 420f
 		val dm = v.resources.displayMetrics
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ViewHolderHeaderProfile.kt b/app/src/main/java/jp/juggler/subwaytooter/ViewHolderHeaderProfile.kt
index c2c077c2..759ac478 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ViewHolderHeaderProfile.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ViewHolderHeaderProfile.kt
@@ -165,7 +165,7 @@ internal class ViewHolderHeaderProfile(
 		setIconDrawableId(
 			activity,
 			btnMore,
-			R.drawable.btn_more,
+			R.drawable.ic_more,
 			color = contentColor,
 			alphaMultiplier = Styler.boost_alpha
 		)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
index d0f7a15b..cd1b22f8 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
@@ -146,10 +146,6 @@ class TootApiClient(
 			bodyString : String? = null,
 			jsonErrorParser : (json : JSONObject) -> String? = DEFAULT_JSON_ERROR_PARSER
 		) : String {
-			val url = response.request()?.url()
-			if(url?.toString()?.contains("misskey") == true) {
-				log.d("Misskey response error: url=$url")
-			}
 			val sb = StringBuilder()
 			try {
 				// body は既に読み終わっているか、そうでなければこれから読む
@@ -171,9 +167,7 @@ class TootApiClient(
 				sb.append("(HTTP ").append(Integer.toString(response.code()))
 				
 				val message = response.message()
-				if(message != null && message.isNotEmpty()) {
-					sb.append(' ').append(message)
-				}
+				if(message.isNotEmpty()) sb.append(' ').append(message)
 				sb.append(")")
 				
 				if(caption.isNotEmpty()) {
@@ -308,15 +302,13 @@ class TootApiClient(
 		val response = result.response !!
 		
 		val request = response.request()
-		if(request != null) {
-			publishApiProgress(
-				context.getString(
-					R.string.reading_api,
-					request.method(),
-					progressPath ?: result.caption
-				)
+		publishApiProgress(
+			context.getString(
+				R.string.reading_api,
+				request.method(),
+				progressPath ?: result.caption
 			)
-		}
+		)
 		
 		val bodyString = response.body()?.string()
 		if(isApiCancelled) return null
@@ -359,7 +351,6 @@ class TootApiClient(
 		val response = result.response !!
 		
 		val request = response.request()
-		if(request != null) {
 			publishApiProgress(
 				context.getString(
 					R.string.reading_api,
@@ -367,7 +358,6 @@ class TootApiClient(
 					progressPath ?: result.caption
 				)
 			)
-		}
 		
 		val bodyBytes = response.body()?.bytes()
 		if(isApiCancelled) return null
@@ -479,15 +469,12 @@ class TootApiClient(
 				sb.append("(HTTP ").append(Integer.toString(response.code()))
 				
 				val message = response.message()
-				if(message != null && message.isNotEmpty()) {
-					sb.append(' ').append(message)
-				}
+				if(message.isNotEmpty()) sb.append(' ').append(message)
+
 				sb.append(")")
 				
-				val url = response.request()?.url()?.toString()
-				if(url?.isNotEmpty() == true) {
-					sb.append(' ').append(url)
-				}
+				val url = response.request().url().toString()
+				if(url.isNotEmpty()) sb.append(' ').append(url)
 				
 				result.error = sb.toString()
 			}
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAttachment.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAttachment.kt
index 7df87795..30c32502 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAttachment.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootAttachment.kt
@@ -40,7 +40,7 @@ class TootAttachment : TootAttachmentLike {
 		private fun guessMediaTypeByUrl(src : String?) : String? {
 			val uri = src.mayUri() ?: return null
 			
-			if( ext_audio.find { uri.path.endsWith(it) } != null ){
+			if( ext_audio.find { uri.path?.endsWith(it) == true } != null ){
 				return TootAttachmentLike.TYPE_AUDIO
 			}
 			
diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.kt
index 995da8f2..fdfe4d94 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/LoginForm.kt
@@ -99,7 +99,7 @@ object LoginForm {
 		val dialog = Dialog(activity)
 		dialog.setContentView(view)
 		// 警告がでるが、パラメータ名の指定を削ってはいけない
-		btnOk.setOnClickListener { v ->
+		btnOk.setOnClickListener { _ ->
 			val instance = etInstance.text.toString().trim { it <= ' ' }
 			
 			when {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
index 9b22525d..b6bc85aa 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/view/MyNetworkImageView.kt
@@ -36,10 +36,10 @@ class MyNetworkImageView : AppCompatImageView {
 	}
 	
 	// ロード中などに表示するDrawableのリソースID
-	private var mDefaultImageId = 0
+	private var mDefaultImage :Drawable? = null
 	
 	// エラー時に表示するDrawableのリソースID
-	private var mErrorImageId = 0
+	private var mErrorImage :Drawable? = null
 	
 	// 角丸の半径。元画像の短辺に対する割合を指定するらしい
 	internal var mCornerRadius = 0f
@@ -67,13 +67,13 @@ class MyNetworkImageView : AppCompatImageView {
 	constructor(context : Context, attrs : AttributeSet, defStyleAttr : Int)
 		: super(context, attrs, defStyleAttr)
 	
-	fun setDefaultImageResId(defaultImage : Int) {
-		mDefaultImageId = defaultImage
+	fun setDefaultImage(defaultImage : Drawable?) {
+		mDefaultImage = defaultImage
 		loadImageIfNecessary()
 	}
 	
-	fun setErrorImageResId(errorImage : Int) {
-		mErrorImageId = errorImage
+	fun setErrorImage(errorImage : Drawable?) {
+		mErrorImage = errorImage
 		loadImageIfNecessary()
 	}
 	
@@ -138,14 +138,7 @@ class MyNetworkImageView : AppCompatImageView {
 		
 	}
 	
-	// デフォルト画像かnull
-	private fun getDefaultDrawable(context : Context?) : Drawable? {
-		return if(context != null && mDefaultImageId != 0) {
-			ContextCompat.getDrawable(context, mDefaultImageId)
-		} else {
-			null
-		}
-	}
+	
 	
 	// 必要なら非同期処理を開始する
 	private fun loadImageIfNecessary() {
@@ -154,7 +147,7 @@ class MyNetworkImageView : AppCompatImageView {
 			if(url?.isEmpty() != false) {
 				// if the URL to be loaded in this view is empty,
 				// cancel any old requests and clear the currently loaded image.
-				cancelLoading(getDefaultDrawable(context))
+				cancelLoading(mDefaultImage)
 				return
 			}
 			
@@ -162,7 +155,7 @@ class MyNetworkImageView : AppCompatImageView {
 			if((mTarget as? UrlTarget)?.urlLoading == url) return
 			
 			// if there is a pre-existing request, cancel it if it's fetching a different URL.
-			cancelLoading(getDefaultDrawable(context))
+			cancelLoading(mDefaultImage)
 			
 			// 非表示状態ならロードを延期する
 			if(! isShown) return
@@ -239,9 +232,9 @@ class MyNetworkImageView : AppCompatImageView {
 			// 別の画像を表示するよう指定が変化していたなら何もしない
 			if(urlLoading != mUrl) return
 			
-			if(mErrorImageId != 0) {
+			if(mErrorImage != null) {
 				// エラー表示用の画像リソースが指定されていたら使う
-				setImageResource(mErrorImageId)
+				setImageDrawable(mErrorImage)
 			} else {
 				// このタイミングでImageViewのDrawableを変更するとチラつきの元になるので何もしない
 			}
diff --git a/app/src/main/java/jp/juggler/util/UiUtils.kt b/app/src/main/java/jp/juggler/util/UiUtils.kt
index 798ac2cf..469b3faf 100644
--- a/app/src/main/java/jp/juggler/util/UiUtils.kt
+++ b/app/src/main/java/jp/juggler/util/UiUtils.kt
@@ -42,23 +42,25 @@ fun getAttributeColor(context : Context, attrId : Int) : Int {
 	return color
 }
 
-fun getAttributeResourceId(context : Context, attrId : Int) : Int {
-	val theme = context.theme
-	val a = theme.obtainStyledAttributes(intArrayOf(attrId))
-	val resourceId = a.getResourceId(0, 0)
-	a.recycle()
-	if(resourceId == 0)
-		throw RuntimeException(
-			String.format(
-				Locale.JAPAN,
-				"attr not defined.attr_id=0x%x",
-				attrId
-			)
-		)
-	return resourceId
-}
 
 fun getAttributeDrawable(context : Context, attrId : Int) : Drawable {
+	
+	fun getAttributeResourceId(context : Context, attrId : Int) : Int {
+		val theme = context.theme
+		val a = theme.obtainStyledAttributes(intArrayOf(attrId))
+		val resourceId = a.getResourceId(0, 0)
+		a.recycle()
+		if(resourceId == 0)
+			throw RuntimeException(
+				String.format(
+					Locale.JAPAN,
+					"attr not defined.attr_id=0x%x",
+					attrId
+				)
+			)
+		return resourceId
+	}
+	
 	val drawableId = getAttributeResourceId(context, attrId)
 	val d = ContextCompat.getDrawable(context, drawableId)
 	return d ?: throw RuntimeException(
@@ -233,21 +235,21 @@ fun setIconDrawableId(
 	}
 }
 
-fun setIconAttr(
-	context : Context,
-	imageView : ImageView,
-	iconAttrId : Int,
-	color : Int? = null,
-	alphaMultiplier : Float? = null
-) {
-	setIconDrawableId(
-		context,
-		imageView,
-		getAttributeResourceId(context, iconAttrId),
-		color,
-		alphaMultiplier
-	)
-}
+//fun setIconAttr(
+//	context : Context,
+//	imageView : ImageView,
+//	iconAttrId : Int,
+//	color : Int? = null,
+//	alphaMultiplier : Float? = null
+//) {
+//	setIconDrawableId(
+//		context,
+//		imageView,
+//		getAttributeResourceId(context, iconAttrId),
+//		color,
+//		alphaMultiplier
+//	)
+//}
 
 fun CharSequence.copyToClipboard(context:Context) {
 	try {
diff --git a/app/src/main/res/drawable-hdpi/btn_attachment.webp b/app/src/main/res/drawable-hdpi/btn_attachment.webp
deleted file mode 100644
index d37d0696..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_attachment.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_attachment_dark.webp b/app/src/main/res/drawable-hdpi/btn_attachment_dark.webp
deleted file mode 100644
index b6b6deb1..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_attachment_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_boost.webp b/app/src/main/res/drawable-hdpi/btn_boost.webp
deleted file mode 100644
index 17188897..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_boost.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_boost_dark.webp b/app/src/main/res/drawable-hdpi/btn_boost_dark.webp
deleted file mode 100644
index 9145c70d..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_boost_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_close.webp b/app/src/main/res/drawable-hdpi/btn_close.webp
deleted file mode 100644
index 6784f701..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_close.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_close_dark.webp b/app/src/main/res/drawable-hdpi/btn_close_dark.webp
deleted file mode 100644
index baeb817a..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_close_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_favourite.webp b/app/src/main/res/drawable-hdpi/btn_favourite.webp
deleted file mode 100644
index 15e0372c..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_favourite.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_favourite_dark.webp b/app/src/main/res/drawable-hdpi/btn_favourite_dark.webp
deleted file mode 100644
index e66b9b12..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_favourite_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_federate_tl.webp b/app/src/main/res/drawable-hdpi/btn_federate_tl.webp
deleted file mode 100644
index 05369fac..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_federate_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_federate_tl_dark.webp b/app/src/main/res/drawable-hdpi/btn_federate_tl_dark.webp
deleted file mode 100644
index 8f76ef53..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_federate_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_home.webp b/app/src/main/res/drawable-hdpi/btn_home.webp
deleted file mode 100644
index cc03e3e9..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_home.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_home_dark.webp b/app/src/main/res/drawable-hdpi/btn_home_dark.webp
deleted file mode 100644
index 2e81d413..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_home_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_local_tl.webp b/app/src/main/res/drawable-hdpi/btn_local_tl.webp
deleted file mode 100644
index 1d487817..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_local_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_local_tl_dark.webp b/app/src/main/res/drawable-hdpi/btn_local_tl_dark.webp
deleted file mode 100644
index 1b4ee10d..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_local_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_more.webp b/app/src/main/res/drawable-hdpi/btn_more.webp
deleted file mode 100644
index c580ccad..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_more.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_more_dark.webp b/app/src/main/res/drawable-hdpi/btn_more_dark.webp
deleted file mode 100644
index 642cf67c..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_more_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_notification.webp b/app/src/main/res/drawable-hdpi/btn_notification.webp
deleted file mode 100644
index e31b4103..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_notification_dark.webp b/app/src/main/res/drawable-hdpi/btn_notification_dark.webp
deleted file mode 100644
index 015092e9..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_notification_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_post.webp b/app/src/main/res/drawable-hdpi/btn_post.webp
deleted file mode 100644
index 26736f34..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_post.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_post_dark.webp b/app/src/main/res/drawable-hdpi/btn_post_dark.webp
deleted file mode 100644
index 1a3c9b46..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_post_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_refresh.webp b/app/src/main/res/drawable-hdpi/btn_refresh.webp
deleted file mode 100644
index 4744839c..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_refresh.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_refresh_dark.webp b/app/src/main/res/drawable-hdpi/btn_refresh_dark.webp
deleted file mode 100644
index 97787d53..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_refresh_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_reply.webp b/app/src/main/res/drawable-hdpi/btn_reply.webp
deleted file mode 100644
index edcbf6fa..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_reply_dark.webp b/app/src/main/res/drawable-hdpi/btn_reply_dark.webp
deleted file mode 100644
index 4bda3f53..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_reply_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_statuses.webp b/app/src/main/res/drawable-hdpi/btn_statuses.webp
deleted file mode 100644
index b9fd414e..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_statuses.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_statuses_dark.webp b/app/src/main/res/drawable-hdpi/btn_statuses_dark.webp
deleted file mode 100644
index 351ce2d3..00000000
Binary files a/app/src/main/res/drawable-hdpi/btn_statuses_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_account_add.webp b/app/src/main/res/drawable-hdpi/ic_account_add.webp
deleted file mode 100644
index 1ba7e2af..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_account_add_dark.webp b/app/src/main/res/drawable-hdpi/ic_account_add_dark.webp
deleted file mode 100644
index f9d753cc..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add.webp b/app/src/main/res/drawable-hdpi/ic_add.webp
deleted file mode 100644
index 336e0e83..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_dark.webp b/app/src/main/res/drawable-hdpi/ic_add_dark.webp
deleted file mode 100644
index 5ca28410..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_block.webp b/app/src/main/res/drawable-hdpi/ic_block.webp
deleted file mode 100644
index a7f0ba63..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_block_dark.webp b/app/src/main/res/drawable-hdpi/ic_block_dark.webp
deleted file mode 100644
index caf8679e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_blocked_by.png b/app/src/main/res/drawable-hdpi/ic_blocked_by.png
new file mode 100644
index 00000000..e2852d18
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_blocked_by.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_blocked_by.webp b/app/src/main/res/drawable-hdpi/ic_blocked_by.webp
deleted file mode 100644
index 02365d94..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_blocked_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark.webp b/app/src/main/res/drawable-hdpi/ic_bookmark.webp
deleted file mode 100644
index 41a98ff0..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark_dark.webp b/app/src/main/res/drawable-hdpi/ic_bookmark_dark.webp
deleted file mode 100644
index 80b3b9ce..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_browser.webp b/app/src/main/res/drawable-hdpi/ic_browser.webp
deleted file mode 100644
index 3b22b0dc..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_browser.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_browser_dark.webp b/app/src/main/res/drawable-hdpi/ic_browser_dark.webp
deleted file mode 100644
index 7138fa3d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_browser_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check.webp b/app/src/main/res/drawable-hdpi/ic_check.webp
deleted file mode 100644
index 52f61894..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check_dark.webp b/app/src/main/res/drawable-hdpi/ic_check_dark.webp
deleted file mode 100644
index 2a1b3ba7..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_conversation.webp b/app/src/main/res/drawable-hdpi/ic_conversation.webp
deleted file mode 100644
index de2af72f..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_conversation.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_conversation_dark.webp b/app/src/main/res/drawable-hdpi/ic_conversation_dark.webp
deleted file mode 100644
index 546eafc6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_conversation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_copy.webp b/app/src/main/res/drawable-hdpi/ic_copy.webp
deleted file mode 100644
index 7e2e54e1..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_copy.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_copy_dark.webp b/app/src/main/res/drawable-hdpi/ic_copy_dark.webp
deleted file mode 100644
index eef1c777..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_copy_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete.webp b/app/src/main/res/drawable-hdpi/ic_delete.webp
deleted file mode 100644
index 24098e2a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_dark.webp b/app/src/main/res/drawable-hdpi/ic_delete_dark.webp
deleted file mode 100644
index fb0ff2ed..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_domain_block.webp b/app/src/main/res/drawable-hdpi/ic_domain_block.webp
deleted file mode 100644
index 90f1e1e2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_domain_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_domain_block_dark.webp b/app/src/main/res/drawable-hdpi/ic_domain_block_dark.webp
deleted file mode 100644
index bdcb35a4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_domain_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_download.webp b/app/src/main/res/drawable-hdpi/ic_download.webp
deleted file mode 100644
index b50be844..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_download.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_download_dark.webp b/app/src/main/res/drawable-hdpi/ic_download_dark.webp
deleted file mode 100644
index 34cd01de..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_download_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_edit.webp b/app/src/main/res/drawable-hdpi/ic_edit.webp
deleted file mode 100644
index 0bba647b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_edit.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_edit_dark.webp b/app/src/main/res/drawable-hdpi/ic_edit_dark.webp
deleted file mode 100644
index 851db98a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_edit_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_error.webp b/app/src/main/res/drawable-hdpi/ic_error.webp
deleted file mode 100644
index 9a16c91e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_error.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_eye_off.webp b/app/src/main/res/drawable-hdpi/ic_eye_off.webp
deleted file mode 100644
index 3f8f762e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_eye_off.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_eye_off_dark.webp b/app/src/main/res/drawable-hdpi/ic_eye_off_dark.webp
deleted file mode 100644
index a3e4ca3b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_eye_off_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_face.webp b/app/src/main/res/drawable-hdpi/ic_face.webp
deleted file mode 100644
index 180feb5b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_face.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_face_dark.webp b/app/src/main/res/drawable-hdpi/ic_face_dark.webp
deleted file mode 100644
index ca483c76..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_face_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_cross.webp b/app/src/main/res/drawable-hdpi/ic_follow_cross.webp
index 3fa9c32e..8585506e 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_cross.webp and b/app/src/main/res/drawable-hdpi/ic_follow_cross.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_cross_dark.webp b/app/src/main/res/drawable-hdpi/ic_follow_cross_dark.webp
deleted file mode 100644
index 44709e2d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_cross_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_plus.webp b/app/src/main/res/drawable-hdpi/ic_follow_plus.webp
index 95cf3847..05bf10a6 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_plus.webp and b/app/src/main/res/drawable-hdpi/ic_follow_plus.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_plus_dark.webp b/app/src/main/res/drawable-hdpi/ic_follow_plus_dark.webp
deleted file mode 100644
index 4da8dbef..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_plus_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_wait.webp b/app/src/main/res/drawable-hdpi/ic_follow_wait.webp
index 55c4b95b..d93b8dae 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_wait.webp and b/app/src/main/res/drawable-hdpi/ic_follow_wait.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_wait_dark.webp b/app/src/main/res/drawable-hdpi/ic_follow_wait_dark.webp
deleted file mode 100644
index b8120ee4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_wait_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_followed_by.png b/app/src/main/res/drawable-hdpi/ic_followed_by.png
new file mode 100644
index 00000000..4ea2170e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_followed_by.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_followed_by.webp b/app/src/main/res/drawable-hdpi/ic_followed_by.webp
deleted file mode 100644
index a74d4c9e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_followed_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_followed_by_dark.webp b/app/src/main/res/drawable-hdpi/ic_followed_by_dark.webp
deleted file mode 100644
index e8e45cb9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_followed_by_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hamburger.webp b/app/src/main/res/drawable-hdpi/ic_hamburger.webp
deleted file mode 100644
index 1b939a31..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hamburger.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hamburger_dark.webp b/app/src/main/res/drawable-hdpi/ic_hamburger_dark.webp
deleted file mode 100644
index 6ae04744..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hamburger_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hashtag.png b/app/src/main/res/drawable-hdpi/ic_hashtag.png
new file mode 100644
index 00000000..3ddeb5d6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hashtag.webp b/app/src/main/res/drawable-hdpi/ic_hashtag.webp
deleted file mode 100644
index 83131de2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hashtag.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hashtag_dark.webp b/app/src/main/res/drawable-hdpi/ic_hashtag_dark.webp
deleted file mode 100644
index c160c8bd..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hashtag_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hot_tub.webp b/app/src/main/res/drawable-hdpi/ic_hot_tub.webp
deleted file mode 100644
index df395e75..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hot_tub.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hot_tub_dark.webp b/app/src/main/res/drawable-hdpi/ic_hot_tub_dark.webp
deleted file mode 100644
index 09b3356d..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hot_tub_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hourglass.webp b/app/src/main/res/drawable-hdpi/ic_hourglass.webp
index e9eb54e9..d65fe532 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_hourglass.webp and b/app/src/main/res/drawable-hdpi/ic_hourglass.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hourglass_dark.webp b/app/src/main/res/drawable-hdpi/ic_hourglass_dark.webp
deleted file mode 100644
index 2a5740c6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hourglass_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info.webp b/app/src/main/res/drawable-hdpi/ic_info.webp
deleted file mode 100644
index dbca3a50..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_info_dark.webp b/app/src/main/res/drawable-hdpi/ic_info_dark.webp
deleted file mode 100644
index a97b7671..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_knob.webp b/app/src/main/res/drawable-hdpi/ic_knob.webp
deleted file mode 100644
index f41235f1..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_knob.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_knob_dark.webp b/app/src/main/res/drawable-hdpi/ic_knob_dark.webp
deleted file mode 100644
index 91f03138..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_knob_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_left.webp b/app/src/main/res/drawable-hdpi/ic_left.webp
deleted file mode 100644
index 1329436e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_left.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_left_dark.webp b/app/src/main/res/drawable-hdpi/ic_left_dark.webp
deleted file mode 100644
index b4db7045..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_left_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list.webp b/app/src/main/res/drawable-hdpi/ic_list.webp
deleted file mode 100644
index 05712d24..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list2.webp b/app/src/main/res/drawable-hdpi/ic_list2.webp
deleted file mode 100644
index 1f981911..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list2.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list2_dark.webp b/app/src/main/res/drawable-hdpi/ic_list2_dark.webp
deleted file mode 100644
index 17dcda66..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list2_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_dark.webp b/app/src/main/res/drawable-hdpi/ic_list_dark.webp
deleted file mode 100644
index 9ca9b4a3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_list.webp b/app/src/main/res/drawable-hdpi/ic_list_list.webp
index f498316c..9c2a6702 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_list_list.webp and b/app/src/main/res/drawable-hdpi/ic_list_list.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_list_dark.webp b/app/src/main/res/drawable-hdpi/ic_list_list_dark.webp
deleted file mode 100644
index 938cc07e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_member.webp b/app/src/main/res/drawable-hdpi/ic_list_member.webp
index bfa448b7..76d2b109 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_list_member.webp and b/app/src/main/res/drawable-hdpi/ic_list_member.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_member_dark.webp b/app/src/main/res/drawable-hdpi/ic_list_member_dark.webp
deleted file mode 100644
index c294a2bf..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list_member_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_tl.webp b/app/src/main/res/drawable-hdpi/ic_list_tl.webp
index f5ed20bc..55ca1276 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_list_tl.webp and b/app/src/main/res/drawable-hdpi/ic_list_tl.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_list_tl_dark.webp b/app/src/main/res/drawable-hdpi/ic_list_tl_dark.webp
deleted file mode 100644
index f23dcbac..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_list_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_loading.webp b/app/src/main/res/drawable-hdpi/ic_loading.webp
deleted file mode 100644
index 11eb763c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_loading.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_loading_dark.webp b/app/src/main/res/drawable-hdpi/ic_loading_dark.webp
deleted file mode 100644
index 9dfa8ee5..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_loading_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_home.webp b/app/src/main/res/drawable-hdpi/ic_local_home.webp
index 64832ac5..666321c3 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_home.webp and b/app/src/main/res/drawable-hdpi/ic_local_home.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_home_dark.webp b/app/src/main/res/drawable-hdpi/ic_local_home_dark.webp
index 261c6027..c33cb501 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_home_dark.webp and b/app/src/main/res/drawable-hdpi/ic_local_home_dark.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_lock.webp b/app/src/main/res/drawable-hdpi/ic_local_lock.webp
index 9a1f53c2..d8d3f70c 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_lock.webp and b/app/src/main/res/drawable-hdpi/ic_local_lock.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_lock_dark.webp b/app/src/main/res/drawable-hdpi/ic_local_lock_dark.webp
index d6350689..ea15bbf6 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_lock_dark.webp and b/app/src/main/res/drawable-hdpi/ic_local_lock_dark.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_lock_open.webp b/app/src/main/res/drawable-hdpi/ic_local_lock_open.webp
index 29f3a948..e10a1662 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_lock_open.webp and b/app/src/main/res/drawable-hdpi/ic_local_lock_open.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_lock_open_dark.webp b/app/src/main/res/drawable-hdpi/ic_local_lock_open_dark.webp
index 668c8ffc..a8e3be56 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_lock_open_dark.webp and b/app/src/main/res/drawable-hdpi/ic_local_lock_open_dark.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_ltl.webp b/app/src/main/res/drawable-hdpi/ic_local_ltl.webp
index 029c77fa..9d81e313 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_ltl.webp and b/app/src/main/res/drawable-hdpi/ic_local_ltl.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_ltl_dark.webp b/app/src/main/res/drawable-hdpi/ic_local_ltl_dark.webp
index b66884d3..6fea539e 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_local_ltl_dark.webp and b/app/src/main/res/drawable-hdpi/ic_local_ltl_dark.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock.webp b/app/src/main/res/drawable-hdpi/ic_lock.webp
deleted file mode 100644
index d335300c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_dark.webp b/app/src/main/res/drawable-hdpi/ic_lock_dark.webp
deleted file mode 100644
index 9706c743..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open.webp b/app/src/main/res/drawable-hdpi/ic_lock_open.webp
deleted file mode 100644
index 10df8f02..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_open.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_dark.webp b/app/src/main/res/drawable-hdpi/ic_lock_open_dark.webp
deleted file mode 100644
index 50dd9ae0..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_open_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mail.webp b/app/src/main/res/drawable-hdpi/ic_mail.webp
deleted file mode 100644
index e8229565..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mail.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mail_dark.webp b/app/src/main/res/drawable-hdpi/ic_mail_dark.webp
deleted file mode 100644
index 4d40157a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mail_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu.webp b/app/src/main/res/drawable-hdpi/ic_menu.webp
deleted file mode 100644
index 6ae04744..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_dark.webp b/app/src/main/res/drawable-hdpi/ic_menu_dark.webp
deleted file mode 100644
index 1b939a31..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mute.webp b/app/src/main/res/drawable-hdpi/ic_mute.webp
deleted file mode 100644
index 61620fb2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mute.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mute_dark.webp b/app/src/main/res/drawable-hdpi/ic_mute_dark.webp
deleted file mode 100644
index 2dab2102..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mute_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_nicoru.webp b/app/src/main/res/drawable-hdpi/ic_nicoru.webp
index 7b2ca00d..0dc9b660 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_nicoru.webp and b/app/src/main/res/drawable-hdpi/ic_nicoru.webp differ
diff --git a/app/src/main/res/drawable-hdpi/ic_nicoru_dark.webp b/app/src/main/res/drawable-hdpi/ic_nicoru_dark.webp
deleted file mode 100644
index 96892e5f..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_nicoru_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_plugin.webp b/app/src/main/res/drawable-hdpi/ic_plugin.webp
deleted file mode 100644
index 3755d561..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_plugin.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_plugin_dark.webp b/app/src/main/res/drawable-hdpi/ic_plugin_dark.webp
deleted file mode 100644
index 2653576f..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_plugin_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_public.webp b/app/src/main/res/drawable-hdpi/ic_public.webp
deleted file mode 100644
index 83b52a18..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_public.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_public_dark.webp b/app/src/main/res/drawable-hdpi/ic_public_dark.webp
deleted file mode 100644
index 3424cd89..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_public_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pulse.png b/app/src/main/res/drawable-hdpi/ic_pulse.png
new file mode 100644
index 00000000..04fd053d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pulse.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pulse.webp b/app/src/main/res/drawable-hdpi/ic_pulse.webp
deleted file mode 100644
index de3c0c98..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pulse.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_requested_by.png b/app/src/main/res/drawable-hdpi/ic_requested_by.png
new file mode 100644
index 00000000..59bd9e44
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_requested_by.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_requested_by.webp b/app/src/main/res/drawable-hdpi/ic_requested_by.webp
deleted file mode 100644
index 67c0e94e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_requested_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_right.webp b/app/src/main/res/drawable-hdpi/ic_right.webp
deleted file mode 100644
index d915201c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_right_dark.webp b/app/src/main/res/drawable-hdpi/ic_right_dark.webp
deleted file mode 100644
index b5645025..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_right_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search.webp b/app/src/main/res/drawable-hdpi/ic_search.webp
deleted file mode 100644
index d5b78f53..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_search.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_dark.webp b/app/src/main/res/drawable-hdpi/ic_search_dark.webp
deleted file mode 100644
index 35fc7989..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_search_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_setting.webp b/app/src/main/res/drawable-hdpi/ic_setting.webp
deleted file mode 100644
index f93f4b74..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_setting.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_setting_dark.webp b/app/src/main/res/drawable-hdpi/ic_setting_dark.webp
deleted file mode 100644
index 780b49ef..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_setting_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share.webp b/app/src/main/res/drawable-hdpi/ic_share.webp
deleted file mode 100644
index faeb11d6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_dark.webp b/app/src/main/res/drawable-hdpi/ic_share_dark.webp
deleted file mode 100644
index 67f0b614..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_toot.webp b/app/src/main/res/drawable-hdpi/ic_toot.webp
deleted file mode 100644
index 851db98a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_toot.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_toot_dark.webp b/app/src/main/res/drawable-hdpi/ic_toot_dark.webp
deleted file mode 100644
index 0bba647b..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_toot_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_tune.webp b/app/src/main/res/drawable-hdpi/ic_tune.webp
deleted file mode 100644
index 4db8dc63..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_tune.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_tune_dark.webp b/app/src/main/res/drawable-hdpi/ic_tune_dark.webp
deleted file mode 100644
index 53dbfa5e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_tune_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_unknown.webp b/app/src/main/res/drawable-hdpi/ic_unknown.webp
deleted file mode 100644
index d0f059d5..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_unknown.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_unknown_dark.webp b/app/src/main/res/drawable-hdpi/ic_unknown_dark.webp
deleted file mode 100644
index 40514efe..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_unknown_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up.webp b/app/src/main/res/drawable-hdpi/ic_volume_up.webp
deleted file mode 100644
index 5223e1ec..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_volume_up.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 051abe4c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_vote.png b/app/src/main/res/drawable-hdpi/ic_vote.png
new file mode 100644
index 00000000..028a075b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_vote.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_vote.webp b/app/src/main/res/drawable-hdpi/ic_vote.webp
deleted file mode 100644
index 42e915b9..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_vote.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_vote_dark.webp b/app/src/main/res/drawable-hdpi/ic_vote_dark.webp
deleted file mode 100644
index 09c0bf7a..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_vote_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_attachment.webp b/app/src/main/res/drawable-mdpi/btn_attachment.webp
deleted file mode 100644
index b7c03bf1..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_attachment.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_attachment_dark.webp b/app/src/main/res/drawable-mdpi/btn_attachment_dark.webp
deleted file mode 100644
index f2350bd0..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_attachment_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_boost.webp b/app/src/main/res/drawable-mdpi/btn_boost.webp
deleted file mode 100644
index 1e12461e..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_boost.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_boost_dark.webp b/app/src/main/res/drawable-mdpi/btn_boost_dark.webp
deleted file mode 100644
index de9d26b3..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_boost_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_close.webp b/app/src/main/res/drawable-mdpi/btn_close.webp
deleted file mode 100644
index 7e117a1f..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_close.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_close_dark.webp b/app/src/main/res/drawable-mdpi/btn_close_dark.webp
deleted file mode 100644
index 1d313641..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_close_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_favourite.webp b/app/src/main/res/drawable-mdpi/btn_favourite.webp
deleted file mode 100644
index 22acf0f8..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_favourite.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_favourite_dark.webp b/app/src/main/res/drawable-mdpi/btn_favourite_dark.webp
deleted file mode 100644
index e1c51cd8..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_favourite_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_federate_tl.webp b/app/src/main/res/drawable-mdpi/btn_federate_tl.webp
deleted file mode 100644
index 8ecdd224..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_federate_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_federate_tl_dark.webp b/app/src/main/res/drawable-mdpi/btn_federate_tl_dark.webp
deleted file mode 100644
index 2513f3a8..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_federate_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_home.webp b/app/src/main/res/drawable-mdpi/btn_home.webp
deleted file mode 100644
index cf569127..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_home.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_home_dark.webp b/app/src/main/res/drawable-mdpi/btn_home_dark.webp
deleted file mode 100644
index 88f5b5c1..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_home_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_local_tl.webp b/app/src/main/res/drawable-mdpi/btn_local_tl.webp
deleted file mode 100644
index 78fbd96d..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_local_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_local_tl_dark.webp b/app/src/main/res/drawable-mdpi/btn_local_tl_dark.webp
deleted file mode 100644
index dcc79f1f..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_local_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_more.webp b/app/src/main/res/drawable-mdpi/btn_more.webp
deleted file mode 100644
index a680e8ef..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_more.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_more_dark.webp b/app/src/main/res/drawable-mdpi/btn_more_dark.webp
deleted file mode 100644
index c86e8c99..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_more_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_notification.webp b/app/src/main/res/drawable-mdpi/btn_notification.webp
deleted file mode 100644
index c99ffd6d..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_notification_dark.webp b/app/src/main/res/drawable-mdpi/btn_notification_dark.webp
deleted file mode 100644
index a497cd4b..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_notification_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_post.webp b/app/src/main/res/drawable-mdpi/btn_post.webp
deleted file mode 100644
index a416dd18..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_post.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_post_dark.webp b/app/src/main/res/drawable-mdpi/btn_post_dark.webp
deleted file mode 100644
index 94f759b7..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_post_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_refresh.webp b/app/src/main/res/drawable-mdpi/btn_refresh.webp
deleted file mode 100644
index 112271e6..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_refresh.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_refresh_dark.webp b/app/src/main/res/drawable-mdpi/btn_refresh_dark.webp
deleted file mode 100644
index 3d4cc21c..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_refresh_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_reply.webp b/app/src/main/res/drawable-mdpi/btn_reply.webp
deleted file mode 100644
index 3ceeb871..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_reply_dark.webp b/app/src/main/res/drawable-mdpi/btn_reply_dark.webp
deleted file mode 100644
index cdb2a9c0..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_reply_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_statuses.webp b/app/src/main/res/drawable-mdpi/btn_statuses.webp
deleted file mode 100644
index 649e4e82..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_statuses.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_statuses_dark.webp b/app/src/main/res/drawable-mdpi/btn_statuses_dark.webp
deleted file mode 100644
index 74ec647c..00000000
Binary files a/app/src/main/res/drawable-mdpi/btn_statuses_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_add.webp b/app/src/main/res/drawable-mdpi/ic_account_add.webp
deleted file mode 100644
index 186792d6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_add_dark.webp b/app/src/main/res/drawable-mdpi/ic_account_add_dark.webp
deleted file mode 100644
index 991216af..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add.webp b/app/src/main/res/drawable-mdpi/ic_add.webp
deleted file mode 100644
index e49e9f82..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_dark.webp b/app/src/main/res/drawable-mdpi/ic_add_dark.webp
deleted file mode 100644
index f61d949c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_block.webp b/app/src/main/res/drawable-mdpi/ic_block.webp
deleted file mode 100644
index c7c775c0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_block_dark.webp b/app/src/main/res/drawable-mdpi/ic_block_dark.webp
deleted file mode 100644
index 2a793864..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_blocked_by.png b/app/src/main/res/drawable-mdpi/ic_blocked_by.png
new file mode 100644
index 00000000..5429028b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_blocked_by.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_blocked_by.webp b/app/src/main/res/drawable-mdpi/ic_blocked_by.webp
deleted file mode 100644
index 824ee12b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_blocked_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark.webp b/app/src/main/res/drawable-mdpi/ic_bookmark.webp
deleted file mode 100644
index ead889b9..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bookmark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark_dark.webp b/app/src/main/res/drawable-mdpi/ic_bookmark_dark.webp
deleted file mode 100644
index de45270d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bookmark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_browser.webp b/app/src/main/res/drawable-mdpi/ic_browser.webp
deleted file mode 100644
index 52249b52..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_browser.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_browser_dark.webp b/app/src/main/res/drawable-mdpi/ic_browser_dark.webp
deleted file mode 100644
index cc12272b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_browser_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check.webp b/app/src/main/res/drawable-mdpi/ic_check.webp
deleted file mode 100644
index 28e8cf7c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_check.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check_dark.webp b/app/src/main/res/drawable-mdpi/ic_check_dark.webp
deleted file mode 100644
index 5bb61c86..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_check_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_conversation.webp b/app/src/main/res/drawable-mdpi/ic_conversation.webp
deleted file mode 100644
index 6c52e2c0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_conversation.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_conversation_dark.webp b/app/src/main/res/drawable-mdpi/ic_conversation_dark.webp
deleted file mode 100644
index 57482c7f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_conversation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_copy.webp b/app/src/main/res/drawable-mdpi/ic_copy.webp
deleted file mode 100644
index b26fa650..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_copy.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_copy_dark.webp b/app/src/main/res/drawable-mdpi/ic_copy_dark.webp
deleted file mode 100644
index 2ec9093a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_copy_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete.webp b/app/src/main/res/drawable-mdpi/ic_delete.webp
deleted file mode 100644
index e4ac38cb..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_dark.webp b/app/src/main/res/drawable-mdpi/ic_delete_dark.webp
deleted file mode 100644
index 088c194b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_domain_block.webp b/app/src/main/res/drawable-mdpi/ic_domain_block.webp
deleted file mode 100644
index 52d79465..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_domain_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_domain_block_dark.webp b/app/src/main/res/drawable-mdpi/ic_domain_block_dark.webp
deleted file mode 100644
index 7d36c5e3..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_domain_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_download.webp b/app/src/main/res/drawable-mdpi/ic_download.webp
deleted file mode 100644
index d5c201dc..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_download.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_download_dark.webp b/app/src/main/res/drawable-mdpi/ic_download_dark.webp
deleted file mode 100644
index a9716ddf..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_download_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_edit.webp b/app/src/main/res/drawable-mdpi/ic_edit.webp
deleted file mode 100644
index 28942881..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_edit.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_edit_dark.webp b/app/src/main/res/drawable-mdpi/ic_edit_dark.webp
deleted file mode 100644
index 6bfd1066..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_edit_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_error.webp b/app/src/main/res/drawable-mdpi/ic_error.webp
deleted file mode 100644
index 9d5d503d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_error.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_eye_off.webp b/app/src/main/res/drawable-mdpi/ic_eye_off.webp
deleted file mode 100644
index 67c979b7..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_eye_off.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_eye_off_dark.webp b/app/src/main/res/drawable-mdpi/ic_eye_off_dark.webp
deleted file mode 100644
index 5a0ca87d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_eye_off_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_face.webp b/app/src/main/res/drawable-mdpi/ic_face.webp
deleted file mode 100644
index c9895ca1..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_face.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_face_dark.webp b/app/src/main/res/drawable-mdpi/ic_face_dark.webp
deleted file mode 100644
index a661fdf6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_face_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_cross.webp b/app/src/main/res/drawable-mdpi/ic_follow_cross.webp
index 08dd3824..954964c7 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_cross.webp and b/app/src/main/res/drawable-mdpi/ic_follow_cross.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_cross_dark.webp b/app/src/main/res/drawable-mdpi/ic_follow_cross_dark.webp
deleted file mode 100644
index e3534815..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_cross_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_plus.webp b/app/src/main/res/drawable-mdpi/ic_follow_plus.webp
index b495d47d..52ac8ad0 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_plus.webp and b/app/src/main/res/drawable-mdpi/ic_follow_plus.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_plus_dark.webp b/app/src/main/res/drawable-mdpi/ic_follow_plus_dark.webp
deleted file mode 100644
index da172262..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_plus_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_wait.webp b/app/src/main/res/drawable-mdpi/ic_follow_wait.webp
index 2ddfebbd..2a1aa28c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_wait.webp and b/app/src/main/res/drawable-mdpi/ic_follow_wait.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_wait_dark.webp b/app/src/main/res/drawable-mdpi/ic_follow_wait_dark.webp
deleted file mode 100644
index c050dc7e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_wait_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_followed_by.png b/app/src/main/res/drawable-mdpi/ic_followed_by.png
new file mode 100644
index 00000000..e6e2f545
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_followed_by.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_followed_by.webp b/app/src/main/res/drawable-mdpi/ic_followed_by.webp
deleted file mode 100644
index 4bf82dd6..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_followed_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_followed_by_dark.webp b/app/src/main/res/drawable-mdpi/ic_followed_by_dark.webp
deleted file mode 100644
index 499d3500..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_followed_by_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hamburger.webp b/app/src/main/res/drawable-mdpi/ic_hamburger.webp
deleted file mode 100644
index e00b5ec4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hamburger.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hamburger_dark.webp b/app/src/main/res/drawable-mdpi/ic_hamburger_dark.webp
deleted file mode 100644
index ed818a79..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hamburger_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hashtag.png b/app/src/main/res/drawable-mdpi/ic_hashtag.png
new file mode 100644
index 00000000..58c794c7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hashtag.webp b/app/src/main/res/drawable-mdpi/ic_hashtag.webp
deleted file mode 100644
index 52b7df86..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hashtag.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hashtag_dark.webp b/app/src/main/res/drawable-mdpi/ic_hashtag_dark.webp
deleted file mode 100644
index 6bd4ae67..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hashtag_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hot_tub.webp b/app/src/main/res/drawable-mdpi/ic_hot_tub.webp
deleted file mode 100644
index b7e67461..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hot_tub.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hot_tub_dark.webp b/app/src/main/res/drawable-mdpi/ic_hot_tub_dark.webp
deleted file mode 100644
index cb07c46d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hot_tub_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hourglass.webp b/app/src/main/res/drawable-mdpi/ic_hourglass.webp
index 82feeef5..2ed1c795 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_hourglass.webp and b/app/src/main/res/drawable-mdpi/ic_hourglass.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hourglass_dark.webp b/app/src/main/res/drawable-mdpi/ic_hourglass_dark.webp
deleted file mode 100644
index cdbfe884..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hourglass_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info.webp b/app/src/main/res/drawable-mdpi/ic_info.webp
deleted file mode 100644
index b4d8cc02..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_dark.webp b/app/src/main/res/drawable-mdpi/ic_info_dark.webp
deleted file mode 100644
index f9b41a1f..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_knob.webp b/app/src/main/res/drawable-mdpi/ic_knob.webp
deleted file mode 100644
index 06fa0abd..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_knob.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_knob_dark.webp b/app/src/main/res/drawable-mdpi/ic_knob_dark.webp
deleted file mode 100644
index f4d23313..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_knob_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_left.webp b/app/src/main/res/drawable-mdpi/ic_left.webp
deleted file mode 100644
index 3d8df80a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_left.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_left_dark.webp b/app/src/main/res/drawable-mdpi/ic_left_dark.webp
deleted file mode 100644
index 7e6a15b0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_left_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list.webp b/app/src/main/res/drawable-mdpi/ic_list.webp
deleted file mode 100644
index e5f46874..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list2.webp b/app/src/main/res/drawable-mdpi/ic_list2.webp
deleted file mode 100644
index 495ff170..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list2.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list2_dark.webp b/app/src/main/res/drawable-mdpi/ic_list2_dark.webp
deleted file mode 100644
index 38e7d106..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list2_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_dark.webp b/app/src/main/res/drawable-mdpi/ic_list_dark.webp
deleted file mode 100644
index baa445f7..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_list.webp b/app/src/main/res/drawable-mdpi/ic_list_list.webp
index 01312635..599f928a 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_list_list.webp and b/app/src/main/res/drawable-mdpi/ic_list_list.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_list_dark.webp b/app/src/main/res/drawable-mdpi/ic_list_list_dark.webp
deleted file mode 100644
index 94fee243..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_member.webp b/app/src/main/res/drawable-mdpi/ic_list_member.webp
index c0a13eb0..d96bcf1e 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_list_member.webp and b/app/src/main/res/drawable-mdpi/ic_list_member.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_member_dark.webp b/app/src/main/res/drawable-mdpi/ic_list_member_dark.webp
deleted file mode 100644
index 21961471..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list_member_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_tl.webp b/app/src/main/res/drawable-mdpi/ic_list_tl.webp
index 73803f03..4cf7c76b 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_list_tl.webp and b/app/src/main/res/drawable-mdpi/ic_list_tl.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_list_tl_dark.webp b/app/src/main/res/drawable-mdpi/ic_list_tl_dark.webp
deleted file mode 100644
index 3838ce07..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_list_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_loading.webp b/app/src/main/res/drawable-mdpi/ic_loading.webp
deleted file mode 100644
index 2f5c83af..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_loading.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_loading_dark.webp b/app/src/main/res/drawable-mdpi/ic_loading_dark.webp
deleted file mode 100644
index 577bcf56..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_loading_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_home.webp b/app/src/main/res/drawable-mdpi/ic_local_home.webp
index a6ad5220..e8122a64 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_home.webp and b/app/src/main/res/drawable-mdpi/ic_local_home.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_home_dark.webp b/app/src/main/res/drawable-mdpi/ic_local_home_dark.webp
index a162893f..11cc919c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_home_dark.webp and b/app/src/main/res/drawable-mdpi/ic_local_home_dark.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_lock.webp b/app/src/main/res/drawable-mdpi/ic_local_lock.webp
index 718f646d..68e69449 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_lock.webp and b/app/src/main/res/drawable-mdpi/ic_local_lock.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_lock_dark.webp b/app/src/main/res/drawable-mdpi/ic_local_lock_dark.webp
index de0ce1c5..22f4c6d9 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_lock_dark.webp and b/app/src/main/res/drawable-mdpi/ic_local_lock_dark.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_lock_open.webp b/app/src/main/res/drawable-mdpi/ic_local_lock_open.webp
index d3465bee..b4cb7102 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_lock_open.webp and b/app/src/main/res/drawable-mdpi/ic_local_lock_open.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_lock_open_dark.webp b/app/src/main/res/drawable-mdpi/ic_local_lock_open_dark.webp
index 53cab92b..2f940559 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_lock_open_dark.webp and b/app/src/main/res/drawable-mdpi/ic_local_lock_open_dark.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_ltl.webp b/app/src/main/res/drawable-mdpi/ic_local_ltl.webp
index e65f5b28..74cfdd42 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_ltl.webp and b/app/src/main/res/drawable-mdpi/ic_local_ltl.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_ltl_dark.webp b/app/src/main/res/drawable-mdpi/ic_local_ltl_dark.webp
index 6e63884a..30541039 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_local_ltl_dark.webp and b/app/src/main/res/drawable-mdpi/ic_local_ltl_dark.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock.webp b/app/src/main/res/drawable-mdpi/ic_lock.webp
deleted file mode 100644
index 3ae785da..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_dark.webp b/app/src/main/res/drawable-mdpi/ic_lock_dark.webp
deleted file mode 100644
index 7bb848f4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open.webp b/app/src/main/res/drawable-mdpi/ic_lock_open.webp
deleted file mode 100644
index 62bfae8b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_open.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_dark.webp b/app/src/main/res/drawable-mdpi/ic_lock_open_dark.webp
deleted file mode 100644
index db978938..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_open_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mail.webp b/app/src/main/res/drawable-mdpi/ic_mail.webp
deleted file mode 100644
index 63299ad2..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mail.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mail_dark.webp b/app/src/main/res/drawable-mdpi/ic_mail_dark.webp
deleted file mode 100644
index 00248bf9..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mail_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu.webp b/app/src/main/res/drawable-mdpi/ic_menu.webp
deleted file mode 100644
index ed818a79..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_dark.webp b/app/src/main/res/drawable-mdpi/ic_menu_dark.webp
deleted file mode 100644
index e00b5ec4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mute.webp b/app/src/main/res/drawable-mdpi/ic_mute.webp
deleted file mode 100644
index 6f05c44d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mute.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mute_dark.webp b/app/src/main/res/drawable-mdpi/ic_mute_dark.webp
deleted file mode 100644
index c0e829d3..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mute_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_nicoru.webp b/app/src/main/res/drawable-mdpi/ic_nicoru.webp
index cdd73dcd..927150f1 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_nicoru.webp and b/app/src/main/res/drawable-mdpi/ic_nicoru.webp differ
diff --git a/app/src/main/res/drawable-mdpi/ic_nicoru_dark.webp b/app/src/main/res/drawable-mdpi/ic_nicoru_dark.webp
deleted file mode 100644
index 4dc463b8..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_nicoru_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_plugin.webp b/app/src/main/res/drawable-mdpi/ic_plugin.webp
deleted file mode 100644
index c7645bba..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_plugin.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_plugin_dark.webp b/app/src/main/res/drawable-mdpi/ic_plugin_dark.webp
deleted file mode 100644
index 6109f9e3..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_plugin_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_public.webp b/app/src/main/res/drawable-mdpi/ic_public.webp
deleted file mode 100644
index a11d0497..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_public.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_public_dark.webp b/app/src/main/res/drawable-mdpi/ic_public_dark.webp
deleted file mode 100644
index 69a674f0..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_public_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pulse.png b/app/src/main/res/drawable-mdpi/ic_pulse.png
new file mode 100644
index 00000000..841ce205
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pulse.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pulse.webp b/app/src/main/res/drawable-mdpi/ic_pulse.webp
deleted file mode 100644
index 59eab988..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pulse.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_requested_by.png b/app/src/main/res/drawable-mdpi/ic_requested_by.png
new file mode 100644
index 00000000..ab3a0961
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_requested_by.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_requested_by.webp b/app/src/main/res/drawable-mdpi/ic_requested_by.webp
deleted file mode 100644
index f2cd9e98..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_requested_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_right.webp b/app/src/main/res/drawable-mdpi/ic_right.webp
deleted file mode 100644
index 63a4c931..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_right_dark.webp b/app/src/main/res/drawable-mdpi/ic_right_dark.webp
deleted file mode 100644
index e805ff2d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_right_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search.webp b/app/src/main/res/drawable-mdpi/ic_search.webp
deleted file mode 100644
index 6aa6d447..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_search.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_dark.webp b/app/src/main/res/drawable-mdpi/ic_search_dark.webp
deleted file mode 100644
index 71a74d14..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_search_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_setting.webp b/app/src/main/res/drawable-mdpi/ic_setting.webp
deleted file mode 100644
index f4fbcd67..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_setting.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_setting_dark.webp b/app/src/main/res/drawable-mdpi/ic_setting_dark.webp
deleted file mode 100644
index f566035a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_setting_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share.webp b/app/src/main/res/drawable-mdpi/ic_share.webp
deleted file mode 100644
index abdf5e6c..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_dark.webp b/app/src/main/res/drawable-mdpi/ic_share_dark.webp
deleted file mode 100644
index 8434b310..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_toot.webp b/app/src/main/res/drawable-mdpi/ic_toot.webp
deleted file mode 100644
index 6bfd1066..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_toot.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_toot_dark.webp b/app/src/main/res/drawable-mdpi/ic_toot_dark.webp
deleted file mode 100644
index 28942881..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_toot_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_tune.webp b/app/src/main/res/drawable-mdpi/ic_tune.webp
deleted file mode 100644
index ba70be39..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_tune.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_tune_dark.webp b/app/src/main/res/drawable-mdpi/ic_tune_dark.webp
deleted file mode 100644
index f3ca013e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_tune_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_unknown.webp b/app/src/main/res/drawable-mdpi/ic_unknown.webp
deleted file mode 100644
index 64a57796..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_unknown.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_unknown_dark.webp b/app/src/main/res/drawable-mdpi/ic_unknown_dark.webp
deleted file mode 100644
index 5d8a721d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_unknown_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up.webp b/app/src/main/res/drawable-mdpi/ic_volume_up.webp
deleted file mode 100644
index 0c815e8d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_volume_up.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 133414c4..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_vote.png b/app/src/main/res/drawable-mdpi/ic_vote.png
new file mode 100644
index 00000000..b141cd2c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_vote.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_vote.webp b/app/src/main/res/drawable-mdpi/ic_vote.webp
deleted file mode 100644
index c2220e77..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_vote.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_vote_dark.webp b/app/src/main/res/drawable-mdpi/ic_vote_dark.webp
deleted file mode 100644
index 98a63edd..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_vote_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/btn_bg_transparent.xml b/app/src/main/res/drawable-v21/btn_bg_transparent.xml
deleted file mode 100644
index 1cb4ad51..00000000
--- a/app/src/main/res/drawable-v21/btn_bg_transparent.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorRippleEffect">
-    <item android:id="@android:id/mask" android:drawable="@android:color/white" />
-</ripple>
diff --git a/app/src/main/res/drawable-xhdpi/btn_attachment.webp b/app/src/main/res/drawable-xhdpi/btn_attachment.webp
deleted file mode 100644
index 33183793..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_attachment.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_attachment_dark.webp b/app/src/main/res/drawable-xhdpi/btn_attachment_dark.webp
deleted file mode 100644
index 726f62c7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_attachment_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_boost.webp b/app/src/main/res/drawable-xhdpi/btn_boost.webp
deleted file mode 100644
index 27e9f72a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_boost.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_boost_dark.webp b/app/src/main/res/drawable-xhdpi/btn_boost_dark.webp
deleted file mode 100644
index 818f7141..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_boost_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_close.webp b/app/src/main/res/drawable-xhdpi/btn_close.webp
deleted file mode 100644
index 31770bed..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_close.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_close_dark.webp b/app/src/main/res/drawable-xhdpi/btn_close_dark.webp
deleted file mode 100644
index e1d23d50..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_close_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_favourite.webp b/app/src/main/res/drawable-xhdpi/btn_favourite.webp
deleted file mode 100644
index 846245e2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_favourite.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_favourite_dark.webp b/app/src/main/res/drawable-xhdpi/btn_favourite_dark.webp
deleted file mode 100644
index 905a7fdf..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_favourite_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_federate_tl.webp b/app/src/main/res/drawable-xhdpi/btn_federate_tl.webp
deleted file mode 100644
index 868a547c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_federate_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_federate_tl_dark.webp b/app/src/main/res/drawable-xhdpi/btn_federate_tl_dark.webp
deleted file mode 100644
index 4ff7aa61..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_federate_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_home.webp b/app/src/main/res/drawable-xhdpi/btn_home.webp
deleted file mode 100644
index aedba67e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_home.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_home_dark.webp b/app/src/main/res/drawable-xhdpi/btn_home_dark.webp
deleted file mode 100644
index 0f7d064d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_home_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_local_tl.webp b/app/src/main/res/drawable-xhdpi/btn_local_tl.webp
deleted file mode 100644
index 6f31616a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_local_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_local_tl_dark.webp b/app/src/main/res/drawable-xhdpi/btn_local_tl_dark.webp
deleted file mode 100644
index 7f643fb9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_local_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_more.webp b/app/src/main/res/drawable-xhdpi/btn_more.webp
deleted file mode 100644
index 0b1758d3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_more.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_more_dark.webp b/app/src/main/res/drawable-xhdpi/btn_more_dark.webp
deleted file mode 100644
index d80d66f0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_more_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_notification.webp b/app/src/main/res/drawable-xhdpi/btn_notification.webp
deleted file mode 100644
index 7859167d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_notification_dark.webp b/app/src/main/res/drawable-xhdpi/btn_notification_dark.webp
deleted file mode 100644
index 3ab52a4e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_notification_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_post.webp b/app/src/main/res/drawable-xhdpi/btn_post.webp
deleted file mode 100644
index d5fa6a9c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_post.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_post_dark.webp b/app/src/main/res/drawable-xhdpi/btn_post_dark.webp
deleted file mode 100644
index 44008cb1..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_post_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_refresh.webp b/app/src/main/res/drawable-xhdpi/btn_refresh.webp
deleted file mode 100644
index bc27927d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_refresh.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_refresh_dark.webp b/app/src/main/res/drawable-xhdpi/btn_refresh_dark.webp
deleted file mode 100644
index faf39a9d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_refresh_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_reply.webp b/app/src/main/res/drawable-xhdpi/btn_reply.webp
deleted file mode 100644
index 279bebe7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_reply_dark.webp b/app/src/main/res/drawable-xhdpi/btn_reply_dark.webp
deleted file mode 100644
index 2bd88d88..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_reply_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_statuses.webp b/app/src/main/res/drawable-xhdpi/btn_statuses.webp
deleted file mode 100644
index 3327f345..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_statuses.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_statuses_dark.webp b/app/src/main/res/drawable-xhdpi/btn_statuses_dark.webp
deleted file mode 100644
index 4411f576..00000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_statuses_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_add.webp b/app/src/main/res/drawable-xhdpi/ic_account_add.webp
deleted file mode 100644
index 3d83d72c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_add_dark.webp b/app/src/main/res/drawable-xhdpi/ic_account_add_dark.webp
deleted file mode 100644
index fec772c2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add.webp b/app/src/main/res/drawable-xhdpi/ic_add.webp
deleted file mode 100644
index 6d44c3b9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_dark.webp b/app/src/main/res/drawable-xhdpi/ic_add_dark.webp
deleted file mode 100644
index 9b54e331..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_block.webp b/app/src/main/res/drawable-xhdpi/ic_block.webp
deleted file mode 100644
index 38881e81..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_block_dark.webp b/app/src/main/res/drawable-xhdpi/ic_block_dark.webp
deleted file mode 100644
index c6954797..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_blocked_by.png b/app/src/main/res/drawable-xhdpi/ic_blocked_by.png
new file mode 100644
index 00000000..75641143
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_blocked_by.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_blocked_by.webp b/app/src/main/res/drawable-xhdpi/ic_blocked_by.webp
deleted file mode 100644
index 20d34023..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_blocked_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark.webp b/app/src/main/res/drawable-xhdpi/ic_bookmark.webp
deleted file mode 100644
index b4e0e192..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark_dark.webp b/app/src/main/res/drawable-xhdpi/ic_bookmark_dark.webp
deleted file mode 100644
index de3b2ef7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_browser.webp b/app/src/main/res/drawable-xhdpi/ic_browser.webp
deleted file mode 100644
index a420bf6f..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_browser.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_browser_dark.webp b/app/src/main/res/drawable-xhdpi/ic_browser_dark.webp
deleted file mode 100644
index d17c458e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_browser_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check.webp b/app/src/main/res/drawable-xhdpi/ic_check.webp
deleted file mode 100644
index 316bddbc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_check.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check_dark.webp b/app/src/main/res/drawable-xhdpi/ic_check_dark.webp
deleted file mode 100644
index 684978e4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_check_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_conversation.webp b/app/src/main/res/drawable-xhdpi/ic_conversation.webp
deleted file mode 100644
index a3847a47..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_conversation.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_conversation_dark.webp b/app/src/main/res/drawable-xhdpi/ic_conversation_dark.webp
deleted file mode 100644
index a1bbc1f6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_conversation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_copy.webp b/app/src/main/res/drawable-xhdpi/ic_copy.webp
deleted file mode 100644
index 5ff99bb7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_copy.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_copy_dark.webp b/app/src/main/res/drawable-xhdpi/ic_copy_dark.webp
deleted file mode 100644
index 8728b1f2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_copy_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete.webp b/app/src/main/res/drawable-xhdpi/ic_delete.webp
deleted file mode 100644
index 5c91d69c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_dark.webp b/app/src/main/res/drawable-xhdpi/ic_delete_dark.webp
deleted file mode 100644
index 0313ad31..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_domain_block.webp b/app/src/main/res/drawable-xhdpi/ic_domain_block.webp
deleted file mode 100644
index 0dbe52af..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_domain_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_domain_block_dark.webp b/app/src/main/res/drawable-xhdpi/ic_domain_block_dark.webp
deleted file mode 100644
index 57956123..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_domain_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_download.webp b/app/src/main/res/drawable-xhdpi/ic_download.webp
deleted file mode 100644
index 41380eac..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_download.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_download_dark.webp b/app/src/main/res/drawable-xhdpi/ic_download_dark.webp
deleted file mode 100644
index 0e4f9566..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_download_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_edit.webp b/app/src/main/res/drawable-xhdpi/ic_edit.webp
deleted file mode 100644
index f4c6f9e9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_edit.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_edit_dark.webp b/app/src/main/res/drawable-xhdpi/ic_edit_dark.webp
deleted file mode 100644
index 4bb60207..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_edit_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_error.webp b/app/src/main/res/drawable-xhdpi/ic_error.webp
deleted file mode 100644
index d4778d55..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_error.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_eye_off.webp b/app/src/main/res/drawable-xhdpi/ic_eye_off.webp
deleted file mode 100644
index c3d46b54..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_eye_off.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_eye_off_dark.webp b/app/src/main/res/drawable-xhdpi/ic_eye_off_dark.webp
deleted file mode 100644
index 38eed738..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_eye_off_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_face.webp b/app/src/main/res/drawable-xhdpi/ic_face.webp
deleted file mode 100644
index 5b4ed66e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_face.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_face_dark.webp b/app/src/main/res/drawable-xhdpi/ic_face_dark.webp
deleted file mode 100644
index f375f391..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_face_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_cross.webp b/app/src/main/res/drawable-xhdpi/ic_follow_cross.webp
index e878821f..6cce87ae 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_cross.webp and b/app/src/main/res/drawable-xhdpi/ic_follow_cross.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_cross_dark.webp b/app/src/main/res/drawable-xhdpi/ic_follow_cross_dark.webp
deleted file mode 100644
index effc592a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_cross_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_plus.webp b/app/src/main/res/drawable-xhdpi/ic_follow_plus.webp
index 72b5c54c..dbe02403 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_plus.webp and b/app/src/main/res/drawable-xhdpi/ic_follow_plus.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_plus_dark.webp b/app/src/main/res/drawable-xhdpi/ic_follow_plus_dark.webp
deleted file mode 100644
index cfe83472..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_plus_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_wait.webp b/app/src/main/res/drawable-xhdpi/ic_follow_wait.webp
index fdcc84b9..4d016c6a 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_wait.webp and b/app/src/main/res/drawable-xhdpi/ic_follow_wait.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_wait_dark.webp b/app/src/main/res/drawable-xhdpi/ic_follow_wait_dark.webp
deleted file mode 100644
index 833ae5fa..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_wait_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_followed_by.png b/app/src/main/res/drawable-xhdpi/ic_followed_by.png
new file mode 100644
index 00000000..2f7df325
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_followed_by.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_followed_by.webp b/app/src/main/res/drawable-xhdpi/ic_followed_by.webp
deleted file mode 100644
index 4983846e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_followed_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_followed_by_dark.webp b/app/src/main/res/drawable-xhdpi/ic_followed_by_dark.webp
deleted file mode 100644
index b9b9fe0b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_followed_by_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hamburger.webp b/app/src/main/res/drawable-xhdpi/ic_hamburger.webp
deleted file mode 100644
index 8b77dabc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hamburger.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hamburger_dark.webp b/app/src/main/res/drawable-xhdpi/ic_hamburger_dark.webp
deleted file mode 100644
index c9b7af80..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hamburger_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hashtag.png b/app/src/main/res/drawable-xhdpi/ic_hashtag.png
new file mode 100644
index 00000000..5efda11b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hashtag.webp b/app/src/main/res/drawable-xhdpi/ic_hashtag.webp
deleted file mode 100644
index 9f230304..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hashtag.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hashtag_dark.webp b/app/src/main/res/drawable-xhdpi/ic_hashtag_dark.webp
deleted file mode 100644
index 0ced6eb3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hashtag_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hot_tub.webp b/app/src/main/res/drawable-xhdpi/ic_hot_tub.webp
deleted file mode 100644
index 498fa54d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hot_tub.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hot_tub_dark.webp b/app/src/main/res/drawable-xhdpi/ic_hot_tub_dark.webp
deleted file mode 100644
index 8a77b4e4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hot_tub_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hourglass.webp b/app/src/main/res/drawable-xhdpi/ic_hourglass.webp
index 03a55a07..dea24260 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_hourglass.webp and b/app/src/main/res/drawable-xhdpi/ic_hourglass.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hourglass_dark.webp b/app/src/main/res/drawable-xhdpi/ic_hourglass_dark.webp
deleted file mode 100644
index 3983ca05..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hourglass_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info.webp b/app/src/main/res/drawable-xhdpi/ic_info.webp
deleted file mode 100644
index db6be815..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_dark.webp b/app/src/main/res/drawable-xhdpi/ic_info_dark.webp
deleted file mode 100644
index b09ea4d2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_knob.webp b/app/src/main/res/drawable-xhdpi/ic_knob.webp
deleted file mode 100644
index 3a70232e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_knob.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_knob_dark.webp b/app/src/main/res/drawable-xhdpi/ic_knob_dark.webp
deleted file mode 100644
index 493dc8f3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_knob_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_left.webp b/app/src/main/res/drawable-xhdpi/ic_left.webp
deleted file mode 100644
index 195b8c14..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_left.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_left_dark.webp b/app/src/main/res/drawable-xhdpi/ic_left_dark.webp
deleted file mode 100644
index 44214f76..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_left_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list.webp b/app/src/main/res/drawable-xhdpi/ic_list.webp
deleted file mode 100644
index 539b0217..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list2.webp b/app/src/main/res/drawable-xhdpi/ic_list2.webp
deleted file mode 100644
index 53d1c65e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list2.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list2_dark.webp b/app/src/main/res/drawable-xhdpi/ic_list2_dark.webp
deleted file mode 100644
index 366e55e7..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list2_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_dark.webp b/app/src/main/res/drawable-xhdpi/ic_list_dark.webp
deleted file mode 100644
index 94b881ef..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_list.webp b/app/src/main/res/drawable-xhdpi/ic_list_list.webp
index 95ea8b71..cfac570c 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_list.webp and b/app/src/main/res/drawable-xhdpi/ic_list_list.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_list_dark.webp b/app/src/main/res/drawable-xhdpi/ic_list_list_dark.webp
deleted file mode 100644
index 73ecdad9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_member.webp b/app/src/main/res/drawable-xhdpi/ic_list_member.webp
index 92059033..347077ad 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_member.webp and b/app/src/main/res/drawable-xhdpi/ic_list_member.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_member_dark.webp b/app/src/main/res/drawable-xhdpi/ic_list_member_dark.webp
deleted file mode 100644
index 5ceb0aa8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_member_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_tl.webp b/app/src/main/res/drawable-xhdpi/ic_list_tl.webp
index e2a4959b..7a8c2e7f 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_tl.webp and b/app/src/main/res/drawable-xhdpi/ic_list_tl.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_list_tl_dark.webp b/app/src/main/res/drawable-xhdpi/ic_list_tl_dark.webp
deleted file mode 100644
index 7901e073..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_list_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_loading.webp b/app/src/main/res/drawable-xhdpi/ic_loading.webp
deleted file mode 100644
index 3dcb8b7a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_loading.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_loading_dark.webp b/app/src/main/res/drawable-xhdpi/ic_loading_dark.webp
deleted file mode 100644
index c3bb7ea4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_loading_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_home.webp b/app/src/main/res/drawable-xhdpi/ic_local_home.webp
index 7e66f071..0efbb3a9 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_home.webp and b/app/src/main/res/drawable-xhdpi/ic_local_home.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_home_dark.webp b/app/src/main/res/drawable-xhdpi/ic_local_home_dark.webp
index 786d10c5..665376c7 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_home_dark.webp and b/app/src/main/res/drawable-xhdpi/ic_local_home_dark.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_lock.webp b/app/src/main/res/drawable-xhdpi/ic_local_lock.webp
index b638d87e..227ee765 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_lock.webp and b/app/src/main/res/drawable-xhdpi/ic_local_lock.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_lock_dark.webp b/app/src/main/res/drawable-xhdpi/ic_local_lock_dark.webp
index 35843d63..2c19b1ea 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_lock_dark.webp and b/app/src/main/res/drawable-xhdpi/ic_local_lock_dark.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_lock_open.webp b/app/src/main/res/drawable-xhdpi/ic_local_lock_open.webp
index 0c506967..f14e73a9 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_lock_open.webp and b/app/src/main/res/drawable-xhdpi/ic_local_lock_open.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_lock_open_dark.webp b/app/src/main/res/drawable-xhdpi/ic_local_lock_open_dark.webp
index 44a158d3..a6cd9f4f 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_lock_open_dark.webp and b/app/src/main/res/drawable-xhdpi/ic_local_lock_open_dark.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_ltl.webp b/app/src/main/res/drawable-xhdpi/ic_local_ltl.webp
index 3665c765..07488eae 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_ltl.webp and b/app/src/main/res/drawable-xhdpi/ic_local_ltl.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_ltl_dark.webp b/app/src/main/res/drawable-xhdpi/ic_local_ltl_dark.webp
index 188a7374..0c05c6ae 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_local_ltl_dark.webp and b/app/src/main/res/drawable-xhdpi/ic_local_ltl_dark.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock.webp b/app/src/main/res/drawable-xhdpi/ic_lock.webp
deleted file mode 100644
index 9d4ed499..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_dark.webp b/app/src/main/res/drawable-xhdpi/ic_lock_dark.webp
deleted file mode 100644
index 1f3c8fb8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open.webp b/app/src/main/res/drawable-xhdpi/ic_lock_open.webp
deleted file mode 100644
index 148dfee6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_open.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_dark.webp b/app/src/main/res/drawable-xhdpi/ic_lock_open_dark.webp
deleted file mode 100644
index c4929903..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_open_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mail.webp b/app/src/main/res/drawable-xhdpi/ic_mail.webp
deleted file mode 100644
index 3af261d3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mail.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mail_dark.webp b/app/src/main/res/drawable-xhdpi/ic_mail_dark.webp
deleted file mode 100644
index 30013038..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mail_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu.webp b/app/src/main/res/drawable-xhdpi/ic_menu.webp
deleted file mode 100644
index c9b7af80..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_dark.webp b/app/src/main/res/drawable-xhdpi/ic_menu_dark.webp
deleted file mode 100644
index 8b77dabc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mute.webp b/app/src/main/res/drawable-xhdpi/ic_mute.webp
deleted file mode 100644
index 29887245..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mute.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mute_dark.webp b/app/src/main/res/drawable-xhdpi/ic_mute_dark.webp
deleted file mode 100644
index 05a20167..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mute_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_nicoru.webp b/app/src/main/res/drawable-xhdpi/ic_nicoru.webp
index a5908600..a3776c77 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_nicoru.webp and b/app/src/main/res/drawable-xhdpi/ic_nicoru.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_nicoru_dark.webp b/app/src/main/res/drawable-xhdpi/ic_nicoru_dark.webp
deleted file mode 100644
index acc39573..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_nicoru_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_plugin.webp b/app/src/main/res/drawable-xhdpi/ic_plugin.webp
deleted file mode 100644
index 5ce8a525..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_plugin.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_plugin_dark.webp b/app/src/main/res/drawable-xhdpi/ic_plugin_dark.webp
deleted file mode 100644
index 36612911..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_plugin_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_public.webp b/app/src/main/res/drawable-xhdpi/ic_public.webp
deleted file mode 100644
index 9743b245..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_public.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_public_dark.webp b/app/src/main/res/drawable-xhdpi/ic_public_dark.webp
deleted file mode 100644
index ec7f28dc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_public_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pulse.png b/app/src/main/res/drawable-xhdpi/ic_pulse.png
new file mode 100644
index 00000000..36983f2e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pulse.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pulse.webp b/app/src/main/res/drawable-xhdpi/ic_pulse.webp
deleted file mode 100644
index eb580b28..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pulse.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_requested_by.png b/app/src/main/res/drawable-xhdpi/ic_requested_by.png
new file mode 100644
index 00000000..33a9a034
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_requested_by.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_requested_by.webp b/app/src/main/res/drawable-xhdpi/ic_requested_by.webp
deleted file mode 100644
index ec62ddef..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_requested_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_right.webp b/app/src/main/res/drawable-xhdpi/ic_right.webp
deleted file mode 100644
index 0a731019..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_right_dark.webp b/app/src/main/res/drawable-xhdpi/ic_right_dark.webp
deleted file mode 100644
index 87e1915b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_right_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search.webp b/app/src/main/res/drawable-xhdpi/ic_search.webp
deleted file mode 100644
index bf2218d6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_search.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_dark.webp b/app/src/main/res/drawable-xhdpi/ic_search_dark.webp
deleted file mode 100644
index c4e50893..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_search_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_setting.webp b/app/src/main/res/drawable-xhdpi/ic_setting.webp
deleted file mode 100644
index afa6e732..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_setting.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_setting_dark.webp b/app/src/main/res/drawable-xhdpi/ic_setting_dark.webp
deleted file mode 100644
index 806bc945..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_setting_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share.webp b/app/src/main/res/drawable-xhdpi/ic_share.webp
deleted file mode 100644
index 3bb692d4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_dark.webp b/app/src/main/res/drawable-xhdpi/ic_share_dark.webp
deleted file mode 100644
index 2dbe32fa..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_toot.webp b/app/src/main/res/drawable-xhdpi/ic_toot.webp
deleted file mode 100644
index 4bb60207..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_toot.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_toot_dark.webp b/app/src/main/res/drawable-xhdpi/ic_toot_dark.webp
deleted file mode 100644
index f4c6f9e9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_toot_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tune.webp b/app/src/main/res/drawable-xhdpi/ic_tune.webp
deleted file mode 100644
index 7ed7624e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tune.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tune_dark.webp b/app/src/main/res/drawable-xhdpi/ic_tune_dark.webp
deleted file mode 100644
index 24d8dcb0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tune_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_unknown.webp b/app/src/main/res/drawable-xhdpi/ic_unknown.webp
deleted file mode 100644
index dac15539..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_unknown.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_unknown_dark.webp b/app/src/main/res/drawable-xhdpi/ic_unknown_dark.webp
deleted file mode 100644
index 758a379c..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_unknown_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up.webp
deleted file mode 100644
index 81ed09af..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_volume_up.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 918dc5f0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vote.png b/app/src/main/res/drawable-xhdpi/ic_vote.png
new file mode 100644
index 00000000..cf62e574
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_vote.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vote.webp b/app/src/main/res/drawable-xhdpi/ic_vote.webp
deleted file mode 100644
index 41824579..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_vote.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vote_dark.webp b/app/src/main/res/drawable-xhdpi/ic_vote_dark.webp
deleted file mode 100644
index 163fa2a0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_vote_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_attachment.webp b/app/src/main/res/drawable-xxhdpi/btn_attachment.webp
deleted file mode 100644
index 4cb832d5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_attachment.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_attachment_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_attachment_dark.webp
deleted file mode 100644
index 8514a7dd..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_attachment_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_boost.webp b/app/src/main/res/drawable-xxhdpi/btn_boost.webp
deleted file mode 100644
index 1efc44ce..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_boost.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_boost_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_boost_dark.webp
deleted file mode 100644
index 2dafca8e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_boost_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_close.webp b/app/src/main/res/drawable-xxhdpi/btn_close.webp
deleted file mode 100644
index 6d90c164..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_close.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_close_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_close_dark.webp
deleted file mode 100644
index 61b8df86..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_close_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_favourite.webp b/app/src/main/res/drawable-xxhdpi/btn_favourite.webp
deleted file mode 100644
index 13f3c5d0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_favourite.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_favourite_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_favourite_dark.webp
deleted file mode 100644
index 00cbb85a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_favourite_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_federate_tl.webp b/app/src/main/res/drawable-xxhdpi/btn_federate_tl.webp
deleted file mode 100644
index 5d75f7d2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_federate_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_federate_tl_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_federate_tl_dark.webp
deleted file mode 100644
index 4c7b4414..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_federate_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_home.webp b/app/src/main/res/drawable-xxhdpi/btn_home.webp
deleted file mode 100644
index eb40dd88..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_home.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_home_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_home_dark.webp
deleted file mode 100644
index f8770df3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_home_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_local_tl.webp b/app/src/main/res/drawable-xxhdpi/btn_local_tl.webp
deleted file mode 100644
index 5d134621..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_local_tl.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_local_tl_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_local_tl_dark.webp
deleted file mode 100644
index 8b285355..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_local_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_more.webp b/app/src/main/res/drawable-xxhdpi/btn_more.webp
deleted file mode 100644
index 5f282c26..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_more.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_more_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_more_dark.webp
deleted file mode 100644
index 2f31136b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_more_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_notification.webp b/app/src/main/res/drawable-xxhdpi/btn_notification.webp
deleted file mode 100644
index 35cb1be7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_notification.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_notification_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_notification_dark.webp
deleted file mode 100644
index a86baad3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_notification_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_post.webp b/app/src/main/res/drawable-xxhdpi/btn_post.webp
deleted file mode 100644
index a22e4e0d..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_post.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_post_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_post_dark.webp
deleted file mode 100644
index fa4349e9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_post_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_refresh.webp b/app/src/main/res/drawable-xxhdpi/btn_refresh.webp
deleted file mode 100644
index 59b5a6e3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_refresh.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_refresh_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_refresh_dark.webp
deleted file mode 100644
index 5771ba57..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_refresh_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_reply.webp b/app/src/main/res/drawable-xxhdpi/btn_reply.webp
deleted file mode 100644
index 50a1406f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_reply.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_reply_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_reply_dark.webp
deleted file mode 100644
index 5f159d91..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_reply_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_statuses.webp b/app/src/main/res/drawable-xxhdpi/btn_statuses.webp
deleted file mode 100644
index 6a820961..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_statuses.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_statuses_dark.webp b/app/src/main/res/drawable-xxhdpi/btn_statuses_dark.webp
deleted file mode 100644
index 45d2f61b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_statuses_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_add.webp b/app/src/main/res/drawable-xxhdpi/ic_account_add.webp
deleted file mode 100644
index 2f3eff63..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_add_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_account_add_dark.webp
deleted file mode 100644
index 25bcb2f9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add.webp b/app/src/main/res/drawable-xxhdpi/ic_add.webp
deleted file mode 100644
index 8c970787..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_add_dark.webp
deleted file mode 100644
index c6316aa4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_block.webp b/app/src/main/res/drawable-xxhdpi/ic_block.webp
deleted file mode 100644
index 7755e75f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_block_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_block_dark.webp
deleted file mode 100644
index 95e01a97..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_blocked_by.png b/app/src/main/res/drawable-xxhdpi/ic_blocked_by.png
new file mode 100644
index 00000000..f4265537
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_blocked_by.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_blocked_by.webp b/app/src/main/res/drawable-xxhdpi/ic_blocked_by.webp
deleted file mode 100644
index d8fdb22c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_blocked_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark.webp b/app/src/main/res/drawable-xxhdpi/ic_bookmark.webp
deleted file mode 100644
index 1c6914b9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_bookmark_dark.webp
deleted file mode 100644
index 0236a19e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_browser.webp b/app/src/main/res/drawable-xxhdpi/ic_browser.webp
deleted file mode 100644
index 2a449941..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_browser.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_browser_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_browser_dark.webp
deleted file mode 100644
index 03752d13..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_browser_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check.webp b/app/src/main/res/drawable-xxhdpi/ic_check.webp
deleted file mode 100644
index 22ee4b34..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_check.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_check_dark.webp
deleted file mode 100644
index 2734500c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_check_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_conversation.webp b/app/src/main/res/drawable-xxhdpi/ic_conversation.webp
deleted file mode 100644
index eaffd937..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_conversation.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_conversation_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_conversation_dark.webp
deleted file mode 100644
index 9c76dac3..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_conversation_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_copy.webp b/app/src/main/res/drawable-xxhdpi/ic_copy.webp
deleted file mode 100644
index 98ca0e13..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_copy.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_copy_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_copy_dark.webp
deleted file mode 100644
index ed29a6a5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_copy_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.webp b/app/src/main/res/drawable-xxhdpi/ic_delete.webp
deleted file mode 100644
index c3ec369a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_delete_dark.webp
deleted file mode 100644
index 66767c56..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_domain_block.webp b/app/src/main/res/drawable-xxhdpi/ic_domain_block.webp
deleted file mode 100644
index 4e0da2e5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_domain_block.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_domain_block_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_domain_block_dark.webp
deleted file mode 100644
index 18795d4f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_domain_block_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_download.webp b/app/src/main/res/drawable-xxhdpi/ic_download.webp
deleted file mode 100644
index c18413d7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_download.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_download_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_download_dark.webp
deleted file mode 100644
index df680867..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_download_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit.webp b/app/src/main/res/drawable-xxhdpi/ic_edit.webp
deleted file mode 100644
index 2f185fac..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_edit.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_edit_dark.webp
deleted file mode 100644
index e6698e67..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_edit_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_error.webp b/app/src/main/res/drawable-xxhdpi/ic_error.webp
deleted file mode 100644
index d4298b7f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_error.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_eye_off.webp b/app/src/main/res/drawable-xxhdpi/ic_eye_off.webp
deleted file mode 100644
index 0743ddc0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_eye_off.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_eye_off_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_eye_off_dark.webp
deleted file mode 100644
index 20f1b490..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_eye_off_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_face.webp b/app/src/main/res/drawable-xxhdpi/ic_face.webp
deleted file mode 100644
index 06e55ef2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_face.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_face_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_face_dark.webp
deleted file mode 100644
index e599a77b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_face_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_cross.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_cross.webp
index bbc31325..6cf9c3aa 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_cross.webp and b/app/src/main/res/drawable-xxhdpi/ic_follow_cross.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_cross_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_cross_dark.webp
deleted file mode 100644
index 5366e4a6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_cross_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_plus.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_plus.webp
index 5e9a8333..57f61dea 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_plus.webp and b/app/src/main/res/drawable-xxhdpi/ic_follow_plus.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_plus_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_plus_dark.webp
deleted file mode 100644
index 416d05ba..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_plus_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_wait.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_wait.webp
index cb9053d3..0e501ba9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_wait.webp and b/app/src/main/res/drawable-xxhdpi/ic_follow_wait.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_wait_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_follow_wait_dark.webp
deleted file mode 100644
index 6cda0684..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_wait_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_followed_by.png b/app/src/main/res/drawable-xxhdpi/ic_followed_by.png
new file mode 100644
index 00000000..894795a2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_followed_by.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_followed_by.webp b/app/src/main/res/drawable-xxhdpi/ic_followed_by.webp
deleted file mode 100644
index 6d264bcf..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_followed_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_followed_by_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_followed_by_dark.webp
deleted file mode 100644
index 712ae641..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_followed_by_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hamburger.webp b/app/src/main/res/drawable-xxhdpi/ic_hamburger.webp
deleted file mode 100644
index f42f1068..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hamburger.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hamburger_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_hamburger_dark.webp
deleted file mode 100644
index 8dcdf35c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hamburger_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hashtag.png b/app/src/main/res/drawable-xxhdpi/ic_hashtag.png
new file mode 100644
index 00000000..fe290320
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hashtag.webp b/app/src/main/res/drawable-xxhdpi/ic_hashtag.webp
deleted file mode 100644
index eb8b6476..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hashtag.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hashtag_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_hashtag_dark.webp
deleted file mode 100644
index 45a88cfa..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hashtag_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot_tub.webp b/app/src/main/res/drawable-xxhdpi/ic_hot_tub.webp
deleted file mode 100644
index 202d206f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hot_tub.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot_tub_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_hot_tub_dark.webp
deleted file mode 100644
index d1b974c7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hot_tub_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hourglass.webp b/app/src/main/res/drawable-xxhdpi/ic_hourglass.webp
index 6667986a..800d356d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hourglass.webp and b/app/src/main/res/drawable-xxhdpi/ic_hourglass.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hourglass_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_hourglass_dark.webp
deleted file mode 100644
index 700db08f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hourglass_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info.webp b/app/src/main/res/drawable-xxhdpi/ic_info.webp
deleted file mode 100644
index b13d4ea9..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_info_dark.webp
deleted file mode 100644
index d0cb9fc1..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_knob.webp b/app/src/main/res/drawable-xxhdpi/ic_knob.webp
deleted file mode 100644
index 54788301..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_knob.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_knob_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_knob_dark.webp
deleted file mode 100644
index 75c35bdc..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_knob_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_left.webp b/app/src/main/res/drawable-xxhdpi/ic_left.webp
deleted file mode 100644
index 3d81c3e8..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_left.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_left_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_left_dark.webp
deleted file mode 100644
index 9a828dba..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_left_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list.webp b/app/src/main/res/drawable-xxhdpi/ic_list.webp
deleted file mode 100644
index 0ba57ff7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list2.webp b/app/src/main/res/drawable-xxhdpi/ic_list2.webp
deleted file mode 100644
index 2b1114ab..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list2.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list2_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_list2_dark.webp
deleted file mode 100644
index ee4df717..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list2_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_list_dark.webp
deleted file mode 100644
index d7a73569..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_list.webp b/app/src/main/res/drawable-xxhdpi/ic_list_list.webp
index be1ee987..8742bc89 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_list.webp and b/app/src/main/res/drawable-xxhdpi/ic_list_list.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_list_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_list_list_dark.webp
deleted file mode 100644
index 7acf0748..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_member.webp b/app/src/main/res/drawable-xxhdpi/ic_list_member.webp
index eaf8d472..90a0cba9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_member.webp and b/app/src/main/res/drawable-xxhdpi/ic_list_member.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_member_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_list_member_dark.webp
deleted file mode 100644
index 12d57666..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_member_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_tl.webp b/app/src/main/res/drawable-xxhdpi/ic_list_tl.webp
index a59e92e5..549d9f47 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_tl.webp and b/app/src/main/res/drawable-xxhdpi/ic_list_tl.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_tl_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_list_tl_dark.webp
deleted file mode 100644
index 783305be..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_list_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_loading.webp b/app/src/main/res/drawable-xxhdpi/ic_loading.webp
deleted file mode 100644
index 8eeceeff..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_loading.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_loading_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_loading_dark.webp
deleted file mode 100644
index 2d984dc6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_loading_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_home.webp b/app/src/main/res/drawable-xxhdpi/ic_local_home.webp
index b110d1e7..d899e059 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_home.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_home.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_home_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_local_home_dark.webp
index 66776655..9d332d66 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_home_dark.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_home_dark.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_lock.webp b/app/src/main/res/drawable-xxhdpi/ic_local_lock.webp
index 7fb2ebe6..056ea408 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_lock.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_lock.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_lock_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_local_lock_dark.webp
index 73788c91..99c574ef 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_lock_dark.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_lock_dark.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_lock_open.webp b/app/src/main/res/drawable-xxhdpi/ic_local_lock_open.webp
index 57affcfc..86104d52 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_lock_open.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_lock_open.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_lock_open_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_local_lock_open_dark.webp
index 849f89ee..f99a23a7 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_lock_open_dark.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_lock_open_dark.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_ltl.webp b/app/src/main/res/drawable-xxhdpi/ic_local_ltl.webp
index 2a2f5e9e..2fe6bb2c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_ltl.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_ltl.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_ltl_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_local_ltl_dark.webp
index 2a84f943..6ea52cc7 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_ltl_dark.webp and b/app/src/main/res/drawable-xxhdpi/ic_local_ltl_dark.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock.webp b/app/src/main/res/drawable-xxhdpi/ic_lock.webp
deleted file mode 100644
index 15e0a574..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_dark.webp
deleted file mode 100644
index 735bab49..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_open.webp
deleted file mode 100644
index dea3d208..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_open.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_lock_open_dark.webp
deleted file mode 100644
index bbf9cb2c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_open_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mail.webp b/app/src/main/res/drawable-xxhdpi/ic_mail.webp
deleted file mode 100644
index e4782e95..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mail.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mail_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_mail_dark.webp
deleted file mode 100644
index d117540e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mail_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu.webp b/app/src/main/res/drawable-xxhdpi/ic_menu.webp
deleted file mode 100644
index 8dcdf35c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_menu_dark.webp
deleted file mode 100644
index f42f1068..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mute.webp b/app/src/main/res/drawable-xxhdpi/ic_mute.webp
deleted file mode 100644
index 742b9762..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mute.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mute_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_mute_dark.webp
deleted file mode 100644
index a711ed5b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mute_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_nicoru.webp b/app/src/main/res/drawable-xxhdpi/ic_nicoru.webp
index b546dbbc..a9cab40f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_nicoru.webp and b/app/src/main/res/drawable-xxhdpi/ic_nicoru.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_nicoru_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_nicoru_dark.webp
deleted file mode 100644
index 4a7a7f7d..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_nicoru_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_plugin.webp b/app/src/main/res/drawable-xxhdpi/ic_plugin.webp
deleted file mode 100644
index a92cc500..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_plugin.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_plugin_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_plugin_dark.webp
deleted file mode 100644
index 03d64e2a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_plugin_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_public.webp b/app/src/main/res/drawable-xxhdpi/ic_public.webp
deleted file mode 100644
index 104d389d..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_public.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_public_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_public_dark.webp
deleted file mode 100644
index b75327d4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_public_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pulse.png b/app/src/main/res/drawable-xxhdpi/ic_pulse.png
new file mode 100644
index 00000000..4376cfe2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pulse.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pulse.webp b/app/src/main/res/drawable-xxhdpi/ic_pulse.webp
deleted file mode 100644
index 0b8fd92a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pulse.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_requested_by.png b/app/src/main/res/drawable-xxhdpi/ic_requested_by.png
new file mode 100644
index 00000000..82889a4b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_requested_by.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_requested_by.webp b/app/src/main/res/drawable-xxhdpi/ic_requested_by.webp
deleted file mode 100644
index 4913a366..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_requested_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_right.webp b/app/src/main/res/drawable-xxhdpi/ic_right.webp
deleted file mode 100644
index 271c198f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_right.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_right_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_right_dark.webp
deleted file mode 100644
index 4e805f36..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_right_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.webp b/app/src/main/res/drawable-xxhdpi/ic_search.webp
deleted file mode 100644
index 46a56559..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_search.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_search_dark.webp
deleted file mode 100644
index de268b72..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_setting.webp b/app/src/main/res/drawable-xxhdpi/ic_setting.webp
deleted file mode 100644
index 981a9da6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_setting.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_setting_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_setting_dark.webp
deleted file mode 100644
index b5120213..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_setting_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share.webp b/app/src/main/res/drawable-xxhdpi/ic_share.webp
deleted file mode 100644
index 0c57c4f4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_share_dark.webp
deleted file mode 100644
index d44a7bbd..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_toot.webp b/app/src/main/res/drawable-xxhdpi/ic_toot.webp
deleted file mode 100644
index e6698e67..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_toot.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_toot_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_toot_dark.webp
deleted file mode 100644
index 2f185fac..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_toot_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tune.webp b/app/src/main/res/drawable-xxhdpi/ic_tune.webp
deleted file mode 100644
index 35e76ba2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_tune.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tune_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_tune_dark.webp
deleted file mode 100644
index f1d23935..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_tune_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unknown.webp b/app/src/main/res/drawable-xxhdpi/ic_unknown.webp
deleted file mode 100644
index b0f08279..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_unknown.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unknown_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_unknown_dark.webp
deleted file mode 100644
index e8bbd2ac..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_unknown_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up.webp
deleted file mode 100644
index 41b439d6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_volume_up.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp
deleted file mode 100644
index 47776bc6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_volume_up_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vote.png b/app/src/main/res/drawable-xxhdpi/ic_vote.png
new file mode 100644
index 00000000..b9007009
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_vote.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vote.webp b/app/src/main/res/drawable-xxhdpi/ic_vote.webp
deleted file mode 100644
index c9c5ff7f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_vote.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vote_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_vote_dark.webp
deleted file mode 100644
index f35811d5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_vote_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.png b/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.png
new file mode 100644
index 00000000..a2b550e3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.webp b/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.webp
deleted file mode 100644
index da1df0de..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_blocked_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_cross.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_cross.webp
index f2a81989..2e92b6bd 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_cross.webp and b/app/src/main/res/drawable-xxxhdpi/ic_follow_cross.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_cross_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_cross_dark.webp
deleted file mode 100644
index ea3777f2..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_cross_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_plus.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_plus.webp
index 20493e06..c5446557 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_plus.webp and b/app/src/main/res/drawable-xxxhdpi/ic_follow_plus.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_plus_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_plus_dark.webp
deleted file mode 100644
index 964ac863..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_plus_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_wait.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_wait.webp
index bb9582ae..e3bbd673 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_wait.webp and b/app/src/main/res/drawable-xxxhdpi/ic_follow_wait.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_wait_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_follow_wait_dark.webp
deleted file mode 100644
index 01a0085d..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_wait_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_followed_by.png b/app/src/main/res/drawable-xxxhdpi/ic_followed_by.png
new file mode 100644
index 00000000..7cde65ee
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_followed_by.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_followed_by.webp b/app/src/main/res/drawable-xxxhdpi/ic_followed_by.webp
deleted file mode 100644
index 43b81f31..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_followed_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_followed_by_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_followed_by_dark.webp
deleted file mode 100644
index c924bfeb..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_followed_by_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hashtag.png b/app/src/main/res/drawable-xxxhdpi/ic_hashtag.png
new file mode 100644
index 00000000..5aeab0d0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hourglass.webp b/app/src/main/res/drawable-xxxhdpi/ic_hourglass.webp
index 40463a85..df8be3b7 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_hourglass.webp and b/app/src/main/res/drawable-xxxhdpi/ic_hourglass.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hourglass_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_hourglass_dark.webp
deleted file mode 100644
index b2954509..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_hourglass_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_list.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_list.webp
index d217b97c..c0e05742 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_list.webp and b/app/src/main/res/drawable-xxxhdpi/ic_list_list.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_list_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_list_dark.webp
deleted file mode 100644
index ec116047..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_list_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_member.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_member.webp
index 733f1041..0468fd22 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_member.webp and b/app/src/main/res/drawable-xxxhdpi/ic_list_member.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_member_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_member_dark.webp
deleted file mode 100644
index 1cd7dde2..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_member_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_tl.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_tl.webp
index 82ca1c75..3e8c410c 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_tl.webp and b/app/src/main/res/drawable-xxxhdpi/ic_list_tl.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_tl_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_list_tl_dark.webp
deleted file mode 100644
index e50e82a7..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_list_tl_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_home.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_home.webp
index b56a17c1..3f519088 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_home.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_home.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_home_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_home_dark.webp
index 53561499..259be752 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_home_dark.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_home_dark.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_lock.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_lock.webp
index 37b6c7c5..8a0b2e5b 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_lock.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_lock.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_dark.webp
index 9045b8e3..0b768ef0 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_dark.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_dark.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open.webp
index 0c0d863c..f9ccac27 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open_dark.webp
index 7ca35bcb..a1c2b53d 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open_dark.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_lock_open_dark.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_ltl.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_ltl.webp
index 0a5b24c4..3665baed 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_ltl.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_ltl.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_local_ltl_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_local_ltl_dark.webp
index 545ef4fa..d506bf6c 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_local_ltl_dark.webp and b/app/src/main/res/drawable-xxxhdpi/ic_local_ltl_dark.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_nicoru.webp b/app/src/main/res/drawable-xxxhdpi/ic_nicoru.webp
index c66eb3d1..70afa172 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_nicoru.webp and b/app/src/main/res/drawable-xxxhdpi/ic_nicoru.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_nicoru_dark.webp b/app/src/main/res/drawable-xxxhdpi/ic_nicoru_dark.webp
deleted file mode 100644
index f0afde35..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_nicoru_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pulse.png b/app/src/main/res/drawable-xxxhdpi/ic_pulse.png
new file mode 100644
index 00000000..c511b6d5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_pulse.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pulse.webp b/app/src/main/res/drawable-xxxhdpi/ic_pulse.webp
deleted file mode 100644
index 06d369be..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pulse.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_requested_by.png b/app/src/main/res/drawable-xxxhdpi/ic_requested_by.png
new file mode 100644
index 00000000..aa19fb36
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_requested_by.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_requested_by.webp b/app/src/main/res/drawable-xxxhdpi/ic_requested_by.webp
deleted file mode 100644
index 56ea24d4..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_requested_by.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_vote.png b/app/src/main/res/drawable-xxxhdpi/ic_vote.png
new file mode 100644
index 00000000..a29cd700
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_vote.png differ
diff --git a/app/src/main/res/drawable/btn_bg_transparent.xml b/app/src/main/res/drawable/btn_bg_transparent.xml
index eb79eed5..4f32da9d 100644
--- a/app/src/main/res/drawable/btn_bg_transparent.xml
+++ b/app/src/main/res/drawable/btn_bg_transparent.xml
@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorRippleEffect" />
-        </shape>
-    </item>
-
-    <item android:state_selected="true">
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorButtonSelected" />
-        </shape>
-    </item>
-
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorButtonSelected" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorRippleEffect"
+    >
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white"
+        />
+</ripple>
diff --git a/app/src/main/res/drawable/ic_account_add.xml b/app/src/main/res/drawable/ic_account_add.xml
new file mode 100644
index 00000000..225ae0a8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_account_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_account_box.xml b/app/src/main/res/drawable/ic_account_box.xml
new file mode 100644
index 00000000..27ee291f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_account_box.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_music.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 67%
rename from app/src/main/res/drawable/ic_music.xml
rename to app/src/main/res/drawable/ic_add.xml
index 736c004e..0258249c 100644
--- a/app/src/main/res/drawable/ic_music.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_announcement.xml b/app/src/main/res/drawable/ic_announcement.xml
new file mode 100644
index 00000000..3d8eee24
--- /dev/null
+++ b/app/src/main/res/drawable/ic_announcement.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,11h-2L11,5h2v6zM13,15h-2v-2h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_attachment.xml b/app/src/main/res/drawable/ic_attachment.xml
new file mode 100644
index 00000000..b2018595
--- /dev/null
+++ b/app/src/main/res/drawable/ic_attachment.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bike.xml b/app/src/main/res/drawable/ic_bike.xml
new file mode 100644
index 00000000..ded5e335
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bike.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml
new file mode 100644
index 00000000..4510bf5b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_block.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
new file mode 100644
index 00000000..6a6a1b39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 00000000..3c728c59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 00000000..ede4b710
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cloud_off.xml b/app/src/main/res/drawable/ic_cloud_off.xml
new file mode 100644
index 00000000..1e753cf4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloud_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
new file mode 100644
index 00000000..8a894a3b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 00000000..2f5557af
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
new file mode 100644
index 00000000..492b41d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 00000000..2ab2fb75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
new file mode 100644
index 00000000..3d98979a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_extension.xml b/app/src/main/res/drawable/ic_extension.xml
new file mode 100644
index 00000000..d3dd0948
--- /dev/null
+++ b/app/src/main/res/drawable/ic_extension.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
new file mode 100644
index 00000000..689f3f47
--- /dev/null
+++ b/app/src/main/res/drawable/ic_eye_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_face.xml b/app/src/main/res/drawable/ic_face.xml
new file mode 100644
index 00000000..43d5552c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_face.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_forum.xml b/app/src/main/res/drawable/ic_forum.xml
new file mode 100644
index 00000000..26eda090
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forum.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_hamburger.xml b/app/src/main/res/drawable/ic_hamburger.xml
new file mode 100644
index 00000000..6d9343b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hamburger.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
new file mode 100644
index 00000000..70fb2910
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_hot_tub.xml b/app/src/main/res/drawable/ic_hot_tub.xml
new file mode 100644
index 00000000..ccb05e29
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hot_tub.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.15,12c-0.31,-0.22 -0.59,-0.46 -0.82,-0.72l-1.4,-1.55c-0.19,-0.21 -0.43,-0.38 -0.69,-0.5 -0.29,-0.14 -0.62,-0.23 -0.96,-0.23h-0.03C6.01,9 5,10.01 5,11.25L5,12L2,12v8c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-8L11.15,12zM7,20L5,20v-6h2v6zM11,20L9,20v-6h2v6zM15,20h-2v-6h2v6zM19,20h-2v-6h2v6zM18.65,5.86l-0.07,-0.07c-0.57,-0.62 -0.82,-1.41 -0.67,-2.2L18,3h-1.89l-0.06,0.43c-0.2,1.36 0.27,2.71 1.3,3.72l0.07,0.06c0.57,0.62 0.82,1.41 0.67,2.2l-0.11,0.59h1.91l0.06,-0.43c0.21,-1.36 -0.27,-2.71 -1.3,-3.71zM14.65,5.86l-0.07,-0.07c-0.57,-0.62 -0.82,-1.41 -0.67,-2.2L14,3h-1.89l-0.06,0.43c-0.2,1.36 0.27,2.71 1.3,3.72l0.07,0.06c0.57,0.62 0.82,1.41 0.67,2.2l-0.11,0.59h1.91l0.06,-0.43c0.21,-1.36 -0.27,-2.71 -1.3,-3.71z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..cc940881
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_left.xml b/app/src/main/res/drawable/ic_left.xml
new file mode 100644
index 00000000..e6bb3ca9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_numbered.xml b/app/src/main/res/drawable/ic_list_numbered.xml
new file mode 100644
index 00000000..0235afcd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_numbered.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_unordered.xml b/app/src/main/res/drawable/ic_list_unordered.xml
new file mode 100644
index 00000000..6cb93c69
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_unordered.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 00000000..67a7c73a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
new file mode 100644
index 00000000..c8125981
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mail.xml b/app/src/main/res/drawable/ic_mail.xml
new file mode 100644
index 00000000..ce97ab85
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mail.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml
new file mode 100644
index 00000000..5176d8a4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_music_dark.xml b/app/src/main/res/drawable/ic_music_dark.xml
deleted file mode 100644
index 69f0a3a4..00000000
--- a/app/src/main/res/drawable/ic_music_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml
new file mode 100644
index 00000000..d597c37e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_browser.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_order.xml b/app/src/main/res/drawable/ic_order.xml
new file mode 100644
index 00000000..d529661c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_order.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,7h2.5L5,3.5 1.5,7L4,7v10L1.5,17L5,20.5 8.5,17L6,17L6,7zM10,5v2h12L22,5L10,5zM10,19h12v-2L10,17v2zM10,13h12v-2L10,11v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_public.xml b/app/src/main/res/drawable/ic_public.xml
new file mode 100644
index 00000000..d976b424
--- /dev/null
+++ b/app/src/main/res/drawable/ic_public.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_question_dark.xml b/app/src/main/res/drawable/ic_question_dark.xml
deleted file mode 100644
index dbd00321..00000000
--- a/app/src/main/res/drawable/ic_question_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 00000000..8229a9a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml
new file mode 100644
index 00000000..e7c67d71
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
new file mode 100644
index 00000000..46b19a0d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml
new file mode 100644
index 00000000..24835127
--- /dev/null
+++ b/app/src/main/res/drawable/ic_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_run.xml b/app/src/main/res/drawable/ic_run.xml
new file mode 100644
index 00000000..d18f6a17
--- /dev/null
+++ b/app/src/main/res/drawable/ic_run.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 00000000..affc7ba2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
new file mode 100644
index 00000000..e145ca83
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..ace746c4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 00000000..e3fe874d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
new file mode 100644
index 00000000..a87ca098
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tune.xml b/app/src/main/res/drawable/ic_tune.xml
new file mode 100644
index 00000000..a15149da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tune.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,17v2h6v-2L3,17zM3,5v2h10L13,5L3,5zM13,21v-2h8v-2h-8v-2h-2v6h2zM7,9v2L3,11v2h4v2h2L9,9L7,9zM21,13v-2L11,11v2h10zM15,9h2L17,7h4L21,5h-4L17,3h-2v6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unknown.xml b/app/src/main/res/drawable/ic_unknown.xml
new file mode 100644
index 00000000..d6fd5ce0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unknown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
new file mode 100644
index 00000000..d6339722
--- /dev/null
+++ b/app/src/main/res/drawable/ic_upload.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_volume_off.xml b/app/src/main/res/drawable/ic_volume_off.xml
new file mode 100644
index 00000000..3aed66dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v2.21l2.45,2.45c0.03,-0.2 0.05,-0.41 0.05,-0.63zM19,12c0,0.94 -0.2,1.82 -0.54,2.64l1.51,1.51C20.63,14.91 21,13.5 21,12c0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM4.27,3L3,4.27 7.73,9L3,9v6h4l5,5v-6.73l4.25,4.25c-0.67,0.52 -1.42,0.93 -2.25,1.18v2.06c1.38,-0.31 2.63,-0.95 3.69,-1.81L19.73,21 21,19.73l-9,-9L4.27,3zM12,4L9.91,6.09 12,8.18L12,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_volume_up.xml b/app/src/main/res/drawable/ic_volume_up.xml
new file mode 100644
index 00000000..bb0c74ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
+</vector>
diff --git a/app/src/main/res/drawable/wide_music.xml b/app/src/main/res/drawable/wide_music.xml
new file mode 100644
index 00000000..acbd4e9a
--- /dev/null
+++ b/app/src/main/res/drawable/wide_music.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="96dp"
+        android:height="24dp"
+        android:viewportWidth="96.0"
+        android:viewportHeight="24.0">
+    <group
+        android:translateX="36"
+        >
+
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
+    </group>
+</vector>
+
+
diff --git a/app/src/main/res/drawable/wide_question.xml b/app/src/main/res/drawable/wide_question.xml
new file mode 100644
index 00000000..c556bf3a
--- /dev/null
+++ b/app/src/main/res/drawable/wide_question.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="96dp"
+        android:height="24dp"
+        android:viewportWidth="96.0"
+        android:viewportHeight="24.0">
+    <group
+        android:translateX="36"
+        >
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/act_account_setting.xml b/app/src/main/res/layout/act_account_setting.xml
index 6d09bf4a..58d31beb 100644
--- a/app/src/main/res/layout/act_account_setting.xml
+++ b/app/src/main/res/layout/act_account_setting.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="128dp"
     android:paddingTop="12dp"
     android:scrollbarStyle="outsideOverlay"
-    tools:ignore="TooManyViews"
+    tools:ignore="TooManyViews,Autofill"
     >
 
     <LinearLayout
@@ -76,7 +76,8 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/edit"
-                android:src="?attr/ic_edit"
+                android:src="@drawable/ic_edit"
+                android:tint="?attr/colorVectorDrawable"
                 />
         </LinearLayout>
 
@@ -166,6 +167,7 @@
                 android:id="@+id/etDisplayName"
                 style="@style/setting_horizontal_stretch"
                 android:inputType="text"
+
                 />
 
             <ImageButton
@@ -175,7 +177,8 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/post"
-                android:src="?attr/btn_post"
+                android:src="@drawable/ic_send"
+                android:tint="?attr/colorVectorDrawable"
                 />
         </LinearLayout>
 
@@ -203,7 +206,8 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/post"
-                android:src="?attr/btn_post"
+                android:src="@drawable/ic_send"
+                android:tint="?attr/colorVectorDrawable"
                 />
         </LinearLayout>
 
@@ -346,7 +350,8 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/post"
-                android:src="?attr/btn_post"
+                android:src="@drawable/ic_send"
+                android:tint="?attr/colorVectorDrawable"
                 />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/act_app_setting_color.xml b/app/src/main/res/layout/act_app_setting_color.xml
index e9e72811..0a37a676 100644
--- a/app/src/main/res/layout/act_app_setting_color.xml
+++ b/app/src/main/res/layout/act_app_setting_color.xml
@@ -236,7 +236,7 @@
                     android:layout_height="32dp"
                     android:layout_marginEnd="4dp"
                     android:importantForAccessibility="no"
-                    tools:src="?attr/btn_federate_tl"
+                    tools:src="@drawable/ic_bike"
                     />
                 <TextView
                     android:id="@+id/tvColumnName"
@@ -468,7 +468,7 @@
                         android:layout_height="48dp"
                         android:background="@drawable/bg_button_cw"
                         android:importantForAccessibility="no"
-                        app:srcCompat="?attr/ic_hamburger"
+                        app:srcCompat="@drawable/ic_hamburger"
                         />
 
                     <View
@@ -526,7 +526,7 @@
                         android:layout_height="48dp"
                         android:background="@drawable/bg_button_cw"
                         android:contentDescription="@string/toot"
-                        app:srcCompat="?attr/ic_edit"
+                        app:srcCompat="@drawable/ic_edit"
                         />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/act_highlight_list.xml b/app/src/main/res/layout/act_highlight_list.xml
index f4fabb18..6a74dbd3 100644
--- a/app/src/main/res/layout/act_highlight_list.xml
+++ b/app/src/main/res/layout/act_highlight_list.xml
@@ -40,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/new_item"
-            android:src="?attr/ic_add"
+            android:src="@drawable/ic_add"
             />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml
index a843cd20..4d465c8a 100644
--- a/app/src/main/res/layout/act_main.xml
+++ b/app/src/main/res/layout/act_main.xml
@@ -67,7 +67,7 @@
                 android:layout_height="48dp"
                 android:background="@drawable/bg_button_cw"
                 android:contentDescription="@string/menu"
-                app:srcCompat="?attr/ic_hamburger"
+                app:srcCompat="@drawable/ic_hamburger"
                 android:scaleType="fitCenter"
                 />
 
@@ -112,7 +112,7 @@
                 android:layout_height="48dp"
                 android:background="@drawable/bg_button_cw"
                 android:contentDescription="@string/toot"
-                app:srcCompat="?attr/ic_edit"
+                app:srcCompat="@drawable/ic_edit"
                 android:scaleType="fitCenter"
                 />
         </LinearLayout>
@@ -144,7 +144,7 @@
                 android:layout_height="48dp"
                 android:background="@drawable/bg_button_cw"
                 android:contentDescription="@string/post"
-                app:srcCompat="?attr/btn_post"
+                app:srcCompat="@drawable/ic_send"
                 />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/act_media_viewer.xml b/app/src/main/res/layout/act_media_viewer.xml
index 501f7c06..ed0b16f4 100644
--- a/app/src/main/res/layout/act_media_viewer.xml
+++ b/app/src/main/res/layout/act_media_viewer.xml
@@ -74,7 +74,7 @@
                 android:layout_height="48dp"
                 android:contentDescription="@string/previous"
                 android:minWidth="48dp"
-                android:src="?attr/ic_left"
+                android:src="@drawable/ic_left"
                 />
 
             <ImageButton
@@ -83,7 +83,7 @@
                 android:layout_height="48dp"
                 android:contentDescription="@string/next"
                 android:minWidth="48dp"
-                android:src="?attr/ic_right"
+                android:src="@drawable/ic_right"
                 />
 
             <ImageButton
@@ -92,7 +92,7 @@
                 android:layout_height="48dp"
                 android:contentDescription="@string/download"
                 android:minWidth="48dp"
-                android:src="?attr/ic_download"
+                android:src="@drawable/ic_download"
                 />
 
             <ImageButton
@@ -101,7 +101,7 @@
                 android:layout_height="48dp"
                 android:contentDescription="@string/more"
                 android:minWidth="48dp"
-                android:src="?attr/btn_more"
+                android:src="@drawable/ic_more"
                 />
 
         </com.google.android.flexbox.FlexboxLayout>
diff --git a/app/src/main/res/layout/act_post.xml b/app/src/main/res/layout/act_post.xml
index cd7a95d7..93644524 100644
--- a/app/src/main/res/layout/act_post.xml
+++ b/app/src/main/res/layout/act_post.xml
@@ -80,7 +80,8 @@
                         android:background="@drawable/btn_bg_transparent"
                         android:contentDescription="@string/delete"
                         android:gravity="center_vertical"
-                        android:src="?attr/btn_close"
+                        android:src="@drawable/ic_close"
+                        android:tint="?attr/colorVectorDrawable"
                         />
                 </LinearLayout>
 
@@ -217,7 +218,10 @@
                     android:layout_height="40dp"
                     android:background="@drawable/btn_bg_transparent"
                     android:contentDescription="@string/open_picker_emoji"
-                    android:src="?attr/ic_face"
+                    android:src="@drawable/ic_face"
+                    android:tint="?attr/colorVectorDrawable"
+
+
                     />
             </LinearLayout>
 
@@ -265,16 +269,22 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:contentDescription="@string/edit"
-                    android:src="?attr/ic_edit"
+                    android:src="@drawable/ic_edit"
                     android:background="@drawable/btn_bg_transparent"
+                    android:tint="?attr/colorVectorDrawable"
+
+
                     />
                 <ImageButton
                     android:id="@+id/ibScheduleReset"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:contentDescription="@string/reset"
-                    android:src="?attr/btn_close"
+                    android:src="@drawable/ic_close"
                     android:background="@drawable/btn_bg_transparent"
+                    android:tint="?attr/colorVectorDrawable"
+
+
                     />
 
             </LinearLayout>
@@ -408,7 +418,11 @@
             android:layout_height="48dp"
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/media_attachment"
-            android:src="?attr/btn_attachment"
+            android:scaleType="fitCenter"
+            android:padding="8dp"
+            android:tint="?attr/colorVectorDrawable"
+            android:src="@drawable/ic_attachment"
+
             />
 
         <ImageButton
@@ -420,7 +434,10 @@
             android:contentDescription="@string/visibility"
             android:minHeight="48dp"
             android:minWidth="48dp"
-            tools:src="?attr/ic_public"
+            tools:src="@drawable/ic_public"
+            android:tint="?attr/colorVectorDrawable"
+
+
             />
 
         <ImageButton
@@ -430,7 +447,10 @@
             android:layout_marginStart="4dp"
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/plugin"
-            android:src="?attr/ic_plugin"
+            android:src="@drawable/ic_extension"
+            android:tint="?attr/colorVectorDrawable"
+
+
             />
 
         <ImageButton
@@ -440,7 +460,10 @@
             android:layout_marginStart="4dp"
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/more"
-            android:src="?attr/btn_more"
+            android:src="@drawable/ic_more"
+            android:tint="?attr/colorVectorDrawable"
+
+
             />
 
         <View
@@ -467,7 +490,8 @@
             android:layout_height="48dp"
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/toot"
-            android:src="?attr/btn_post"
+            android:src="@drawable/ic_send"
+            android:tint="?attr/colorVectorDrawable"
 
             />
     </LinearLayout>
diff --git a/app/src/main/res/layout/dlg_context_menu.xml b/app/src/main/res/layout/dlg_context_menu.xml
index cc56503f..4478902f 100644
--- a/app/src/main/res/layout/dlg_context_menu.xml
+++ b/app/src/main/res/layout/dlg_context_menu.xml
@@ -476,7 +476,7 @@
                             android:background="@drawable/btn_bg_transparent"
                             android:contentDescription="@string/follow"
                             android:scaleType="center"
-                            tools:src="?attr/ic_follow_plus"
+                            tools:src="@drawable/ic_follow_plus"
                             />
 
                         <ImageView
@@ -484,7 +484,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:scaleType="center"
-                            android:src="?attr/ic_followed_by"
+                            android:src="@drawable/ic_followed_by"
                             tools:ignore="ContentDescription"
                             />
                     </FrameLayout>
@@ -501,7 +501,7 @@
                         android:layout_height="40dp"
                         android:background="@drawable/btn_bg_transparent"
                         android:contentDescription="@string/mute"
-                        android:src="?attr/ic_mute"
+                        android:src="@drawable/ic_volume_off"
                         />
 
                     <ImageButton
@@ -510,7 +510,7 @@
                         android:layout_height="40dp"
                         android:background="@drawable/btn_bg_transparent"
                         android:contentDescription="@string/block"
-                        android:src="?attr/ic_block"
+                        android:src="@drawable/ic_block"
                         />
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/lv_column_list.xml b/app/src/main/res/layout/lv_column_list.xml
index 2446595b..f9911715 100644
--- a/app/src/main/res/layout/lv_column_list.xml
+++ b/app/src/main/res/layout/lv_column_list.xml
@@ -63,7 +63,7 @@
             android:background="?attr/colorColumnListDragHandleBackground"
             android:contentDescription="@string/drag_handle"
             android:scaleType="center"
-            android:src="?attr/ic_knob"
+            android:src="@drawable/ic_order"
             />
 
         <LinearLayout
@@ -108,7 +108,7 @@
                     android:layout_marginStart="6dp"
                     android:contentDescription="@string/last_selection"
                     android:scaleType="center"
-                    android:src="?attr/ic_bookmark"
+                    android:src="@drawable/ic_bookmark"
                     />
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/lv_header_profile.xml b/app/src/main/res/layout/lv_header_profile.xml
index 5e0d2bf9..56add104 100644
--- a/app/src/main/res/layout/lv_header_profile.xml
+++ b/app/src/main/res/layout/lv_header_profile.xml
@@ -84,7 +84,7 @@
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/follow"
                 android:scaleType="center"
-                tools:src="?attr/ic_follow_plus"
+                tools:src="@drawable/ic_follow_plus"
                 />
 
             <ImageView
@@ -92,7 +92,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="center"
-                android:src="?attr/ic_followed_by"
+                android:src="@drawable/ic_followed_by"
                 tools:ignore="ContentDescription"
                 />
         </FrameLayout>
@@ -188,7 +188,7 @@
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/follow"
                 android:scaleType="center"
-                tools:src="?attr/ic_follow_plus"
+                tools:src="@drawable/ic_follow_plus"
                 />
 
             <ImageView
@@ -196,7 +196,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="center"
-                android:src="?attr/ic_followed_by"
+                android:src="@drawable/ic_followed_by"
                 tools:ignore="ContentDescription"
                 />
         </FrameLayout>
@@ -263,7 +263,7 @@
             android:minWidth="48dp"
             android:paddingEnd="4dp"
             android:paddingStart="4dp"
-            android:src="?attr/btn_more"
+            android:src="@drawable/ic_more"
             />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/lv_highlight_word.xml b/app/src/main/res/layout/lv_highlight_word.xml
index dd2fcb13..45400975 100644
--- a/app/src/main/res/layout/lv_highlight_word.xml
+++ b/app/src/main/res/layout/lv_highlight_word.xml
@@ -51,7 +51,7 @@
             android:background="?attr/colorColumnListDragHandleBackground"
             android:contentDescription="@string/drag_handle"
             android:scaleType="center"
-            android:src="?attr/ic_knob"
+            android:src="@drawable/ic_order"
             android:visibility="gone"
             />
 
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/btnSound"
-            android:src="?attr/ic_volume_up"
+            android:src="@drawable/ic_volume_up"
             android:contentDescription="@string/check_sound"
             />
     </LinearLayout>
diff --git a/app/src/main/res/layout/lv_mute_app.xml b/app/src/main/res/layout/lv_mute_app.xml
index bc9ae48d..db9f1f14 100644
--- a/app/src/main/res/layout/lv_mute_app.xml
+++ b/app/src/main/res/layout/lv_mute_app.xml
@@ -51,7 +51,7 @@
             android:background="?attr/colorColumnListDragHandleBackground"
             android:contentDescription="@string/drag_handle"
             android:scaleType="center"
-            android:src="?attr/ic_knob"
+            android:src="@drawable/ic_order"
             android:visibility="gone"
             />
 
diff --git a/app/src/main/res/layout/page_column.xml b/app/src/main/res/layout/page_column.xml
index b570a38f..a8025a79 100644
--- a/app/src/main/res/layout/page_column.xml
+++ b/app/src/main/res/layout/page_column.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    tools:ignore="Autofill"
     >
 
     <LinearLayout
@@ -79,7 +80,6 @@
                 android:layout_height="32dp"
                 android:layout_marginEnd="4dp"
                 android:importantForAccessibility="no"
-                android:padding="4dp"
                 android:scaleType="fitCenter"
                 />
 
@@ -99,7 +99,7 @@
                 android:layout_marginStart="2dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/setting"
-                android:src="?attr/ic_tune"
+                android:src="@drawable/ic_tune"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
                 />
@@ -112,7 +112,7 @@
                 android:layout_marginStart="2dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/reload"
-                android:src="?attr/btn_refresh"
+                android:src="@drawable/ic_refresh"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
                 />
@@ -125,7 +125,7 @@
                 android:layout_marginStart="2dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/close_column"
-                android:src="?attr/btn_close"
+                android:src="@drawable/ic_close"
                 android:padding="8dp"
                 android:scaleType="fitCenter"
                 />
@@ -363,7 +363,7 @@
                 android:layout_marginStart="4dp"
                 android:background="@drawable/btn_bg_transparent"
                 android:contentDescription="@string/search"
-                android:src="?attr/ic_search"
+                android:src="@drawable/ic_search"
                 />
 
         </LinearLayout>
@@ -409,7 +409,7 @@
             android:layout_marginStart="4dp"
             android:background="@drawable/btn_bg_transparent"
             android:contentDescription="@string/search"
-            android:src="?attr/ic_add"
+            android:src="@drawable/ic_add"
             />
 
     </LinearLayout>
@@ -558,6 +558,7 @@
                 android:layout_gravity="start|center_vertical"
                 android:layout_marginStart="4dp"
                 android:scaleType="fitCenter"
+                android:importantForAccessibility="no"
                 />
 
             <TextView
diff --git a/app/src/main/res/menu/menu_navi_drawer.xml b/app/src/main/res/menu/menu_navi_drawer.xml
index 325a5b6e..723bd60d 100644
--- a/app/src/main/res/menu/menu_navi_drawer.xml
+++ b/app/src/main/res/menu/menu_navi_drawer.xml
@@ -8,11 +8,11 @@
 
                 <item
                     android:id="@+id/nav_account_add"
-                    android:icon="?attr/ic_account_add"
+                    android:icon="@drawable/ic_account_add"
                     android:title="@string/account_add"/>
                 <item
                     android:id="@+id/nav_account_setting"
-                    android:icon="?attr/ic_setting"
+                    android:icon="@drawable/ic_settings"
                     android:title="@string/account_setting"/>
             </menu>
         </item>
@@ -20,120 +20,120 @@
             <menu>
                 <item
                     android:id="@+id/nav_column_list"
-                    android:icon="?attr/ic_list"
+                    android:icon="@drawable/ic_list_numbered"
                     android:title="@string/column_list"/>
 
                 <item
                     android:id="@+id/nav_close_all_columns"
-                    android:icon="?attr/btn_close"
+                    android:icon="@drawable/ic_close"
                     android:title="@string/close_all_columns"/>
 
                 <item
                     android:id="@+id/nav_add_tl_home"
-                    android:icon="?attr/btn_home"
+                    android:icon="@drawable/ic_home"
                     android:title="@string/home"/>
                 <item
                     android:id="@+id/nav_add_notifications"
-                    android:icon="?attr/btn_notification"
+                    android:icon="@drawable/ic_announcement"
                     android:title="@string/notifications"/>
 
                 <item
                     android:id="@+id/nav_add_direct_message"
-                    android:icon="?attr/ic_mail"
+                    android:icon="@drawable/ic_mail"
                     android:title="@string/direct_messages"/>
 
                 <item
                     android:id="@+id/nav_add_tl_misskey_hybrid"
-                    android:icon="?attr/ic_share"
+                    android:icon="@drawable/ic_share"
                     android:title="@string/misskey_hybrid_timeline_long"/>
 
                 <item
                     android:id="@+id/nav_add_tl_local"
-                    android:icon="?attr/btn_local_tl"
+                    android:icon="@drawable/ic_run"
                     android:title="@string/local_timeline"/>
 
                 <item
                     android:id="@+id/nav_add_tl_federate"
-                    android:icon="?attr/btn_federate_tl"
+                    android:icon="@drawable/ic_bike"
                     android:title="@string/federate_timeline"/>
 
                 <item
                     android:id="@+id/nav_add_list"
-                    android:icon="?attr/ic_list_list"
+                    android:icon="@drawable/ic_list_list"
                     android:title="@string/lists"/>
 
                 <item
                     android:id="@+id/nav_add_tl_search"
-                    android:icon="?attr/ic_search"
+                    android:icon="@drawable/ic_search"
                     android:title="@string/search"/>
 
                 <!--トレンドタグは2.4.1リリース時にAPIごと削除された-->
                 <!--<item-->
                     <!--android:id="@+id/nav_add_trend_tag"-->
-                    <!--android:icon="?attr/ic_hashtag"-->
+                    <!--android:icon="@drawable/ic_hashtag"-->
                     <!--android:title="@string/trend_tag"/>-->
 
                 <item
                     android:id="@+id/nav_add_favourites"
-                    android:icon="?attr/btn_favourite"
+                    android:icon="@drawable/ic_star"
                     android:title="@string/favourites"/>
 
                 <item
                     android:id="@+id/nav_add_statuses"
-                    android:icon="?attr/btn_statuses"
+                    android:icon="@drawable/ic_account_box"
                     android:title="@string/profile"/>
 
                 <item
                     android:id="@+id/nav_follow_requests"
-                    android:icon="?attr/ic_follow_wait"
+                    android:icon="@drawable/ic_follow_wait"
                     android:title="@string/follow_requests"/>
 
                 <item
                     android:id="@+id/nav_follow_suggestion"
-                    android:icon="?attr/ic_follow_plus"
+                    android:icon="@drawable/ic_follow_plus"
                     android:title="@string/follow_suggestion"/>
                 <item
                     android:id="@+id/nav_endorsement"
-                    android:icon="?attr/ic_follow_plus"
+                    android:icon="@drawable/ic_follow_plus"
                     android:title="@string/endorse_set"/>
                 <item
                     android:id="@+id/nav_add_mutes"
-                    android:icon="?attr/ic_mute"
+                    android:icon="@drawable/ic_volume_off"
                     android:title="@string/muted_users"/>
 
                 <item
                     android:id="@+id/nav_add_blocks"
-                    android:icon="?attr/ic_block"
+                    android:icon="@drawable/ic_block"
                     android:title="@string/blocked_users"/>
 
                 <item
                     android:id="@+id/nav_keyword_filter"
-                    android:icon="?attr/ic_mute"
+                    android:icon="@drawable/ic_volume_off"
                     android:title="@string/keyword_filters"/>
 
 
                 <item
                     android:id="@+id/nav_add_domain_blocks"
-                    android:icon="?attr/ic_domain_block"
+                    android:icon="@drawable/ic_cloud_off"
                     android:title="@string/blocked_domains"/>
 
                 <item
                     android:id="@+id/nav_scheduled_statuses_list"
-                    android:icon="?attr/ic_timer"
+                    android:icon="@drawable/ic_timer"
                     android:title="@string/scheduled_status_list"/>
 
                 <!--<item-->
                 <!--android:id="@+id/nav_add_reports"-->
-                <!--android:icon="?attr/btn_report"-->
+                <!--android:icon="@drawable/ic_report"-->
                 <!--android:title="@string/your_reports"/>-->
 
                 <!--<item-->
                 <!--android:id="@+id/nav_slideshow"-->
-                <!--android:icon="?attr/ic_menu_slideshow"-->
+                <!--android:icon="@drawable/ic_menu_slideshow"-->
                 <!--android:title="Slideshow"/>-->
                 <!--<item-->
                 <!--android:id="@+id/nav_manage"-->
-                <!--android:icon="?attr/ic_menu_manage"-->
+                <!--android:icon="@drawable/ic_menu_manage"-->
                 <!--android:title="Tools"/>-->
             </menu>
         </item>
@@ -141,11 +141,11 @@
             <menu>
                 <item
                     android:id="@+id/tootsearch"
-                    android:icon="?attr/ic_search"
+                    android:icon="@drawable/ic_search"
                     android:title="@string/tootsearch"/>
                 <item
                     android:id="@+id/mastodon_search_portal"
-                    android:icon="?attr/ic_search"
+                    android:icon="@drawable/ic_search"
                     android:title="@string/mastodon_search_portal"/>
             </menu>
         </item>
@@ -155,45 +155,45 @@
 
                 <item
                     android:id="@+id/nav_app_setting"
-                    android:icon="?attr/ic_setting"
+                    android:icon="@drawable/ic_settings"
                     android:title="@string/app_setting"/>
 
                 <item
                     android:id="@+id/nav_highlight_word"
-                    android:icon="?attr/ic_setting"
+                    android:icon="@drawable/ic_settings"
                     android:title="@string/highlight_word"/>
 
                 <item
                     android:id="@+id/nav_muted_app"
-                    android:icon="?attr/ic_mute"
+                    android:icon="@drawable/ic_volume_off"
                     android:title="@string/muted_app"/>
                 <item
                     android:id="@+id/nav_muted_word"
-                    android:icon="?attr/ic_mute"
+                    android:icon="@drawable/ic_volume_off"
                     android:title="@string/muted_word"/>
                 <item
                     android:id="@+id/nav_fav_mute"
-                    android:icon="?attr/ic_mute"
+                    android:icon="@drawable/ic_volume_off"
                     android:title="@string/fav_muted_user"/>
 
                 <item
                     android:id="@+id/nav_app_about"
-                    android:icon="?attr/ic_info"
+                    android:icon="@drawable/ic_info"
                     android:title="@string/app_about"/>
 
                 <!--<item-->
                 <!--android:id="@+id/nav_translation"-->
-                <!--android:icon="?attr/ic_info"-->
+                <!--android:icon="@drawable/ic_info"-->
                 <!--android:title="@string/help_translation"/>-->
 
                 <item
                     android:id="@+id/nav_oss_license"
-                    android:icon="?attr/ic_info"
+                    android:icon="@drawable/ic_info"
                     android:title="@string/oss_license"/>
 
                 <item
                     android:id="@+id/nav_app_exit"
-                    android:icon="?attr/ic_hot_tub"
+                    android:icon="@drawable/ic_hot_tub"
                     android:title="@string/app_exit"/>
             </menu>
         </item>
@@ -203,11 +203,11 @@
     <!--<menu>-->
     <!--<item-->
     <!--android:id="@+id/nav_share"-->
-    <!--android:icon="?attr/ic_menu_share"-->
+    <!--android:icon="@drawable/ic_menu_share"-->
     <!--android:title="Share"/>-->
     <!--<item-->
     <!--android:id="@+id/nav_send"-->
-    <!--android:icon="?attr/ic_menu_send"-->
+    <!--android:icon="@drawable/ic_menu_send"-->
     <!--android:title="Send"/>-->
     <!--</menu>-->
     <!--</item>-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 53d6243b..7cc7bf2b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -690,7 +690,7 @@
     <string name="cant_change_account_when_redraft">Impossible de changer de compte lors de la reformulation.</string>
     <string name="delete_base_status_before_toot">Supprimer le statut de base avant l\'affichage. Tous les favoris, les boosts seront perdus. Les réponses seront déconnectées. Les pièces jointes des médias ne seront pas conservées sur Mastodon avant la version 2.4.1. Vous êtes sûr ?</string>
     <string name="notification_tl_font_size">Notification TL font size (unit:sp. leave empty to default. app restart required)</string>
-    <string name="notification_tl_icon_size">Notification TL icon size (unit:dp. default:32. app restart required)</string>
+    <string name="notification_tl_icon_size">Notification TL icon size (Unit:dp. default:24. app restart required)</string>
     <string name="post_button_tapped_repeatly">Le bouton Post a été tapé à plusieurs reprises</string>
     <string name="regex_filter_matches_empty_string">le filtre regex correspond à une chaîne vide.</string>
     <string name="follow_suggestion">Suggestion d’abonnement</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c60b815f..6b98d4b5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -474,7 +474,7 @@
     <string name="notification_style_after_oreo">通知スタイル(Android 8.x 以降)</string>
     <string name="notification_style_before_oreo">通知スタイル(Android 7.x以下。もしお使いのデバイスが8.x以降の場合、アカウント設定から通知スタイルを変更できます)</string>
     <string name="notification_tl_font_size">通知TLのフォントの大きさ (単位:sp。空欄でデフォルト。アプリ再起動が必要)</string>
-    <string name="notification_tl_icon_size">通知TLのアイコンの大きさ (単位:dp。デフォルト:32。アプリ再起動が必要)</string>
+    <string name="notification_tl_icon_size">通知TLのアイコンの大きさ (単位:dp。デフォルト:24。アプリ再起動が必要)</string>
     <string name="notification_type_boost">ブースト</string>
     <string name="notification_type_favourite">お気に入り</string>
     <string name="notification_type_follow">フォロー</string>
@@ -842,9 +842,9 @@
     <string name="cant_change_account_when_editing_scheduled_status">予約した投稿の再編集ではアカウントを変更できません</string>
     <string name="delete_scheduled_status_before_update">投稿する前に編集前の古い予約投稿を削除します。よろしいですか?</string>
     <string name="reply_icon_size">返信アイコンの大きさ(単位:dp。デフォルト:24。アプリ再起動が必要)</string>
-    <string name="header_icon_size">ヘッダ部アイコンの大きさ(単位:dp。デフォルト:32。アプリ再起動が必要)</string>
+    <string name="header_icon_size">ヘッダ部アイコンの大きさ(単位:dp。デフォルト:24。アプリ再起動が必要)</string>
     <string name="header_text_size">ヘッダ部テキストの大きさ(単位:sp。デフォルト:14。アプリ再起動が必要)</string>
-    <string name="strip_icon_size">カラムストリップのアイコンの大きさ(単位:dp。デフォルト:32。アプリ再起動が必要)</string>
+    <string name="strip_icon_size">カラムストリップのアイコンの大きさ(単位:dp。デフォルト:24。アプリ再起動が必要)</string>
     <string name="all">All</string>
     <string name="show_links_in_context_menu">本文中のリンクをコンテキストメニューに表示する</string>
     <string name="scheduled_status_requires_mastodon_2_7_0">予約投稿はマストドン2.7.0以降で使えます</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 713f501d..fa1bf286 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -86,77 +86,7 @@
     <!-- サムネイルの背景色 -->
     <attr name="colorThumbnailBackground" format="color"/>
 
-    <attr name="btn_attachment" format="reference" />
-    <attr name="btn_boost" format="reference" />
-    <attr name="btn_close" format="reference" />
-    <attr name="btn_favourite" format="reference" />
-    <attr name="btn_federate_tl" format="reference" />
-    <attr name="btn_home" format="reference" />
-    <attr name="btn_local_tl" format="reference" />
-    <attr name="btn_more" format="reference" />
-    <attr name="btn_notification" format="reference" />
-    <attr name="btn_post" format="reference" />
-    <attr name="btn_refresh" format="reference" />
-    <attr name="btn_reply" format="reference" />
-    <attr name="btn_statuses" format="reference" />
-    <attr name="ic_account_add" format="reference" />
-    <attr name="ic_block" format="reference" />
-    <attr name="ic_bookmark" format="reference" />
-    <attr name="ic_conversation" format="reference" />
-    <attr name="ic_hot_tub" format="reference" />
-    <attr name="ic_info" format="reference" />
-    <attr name="ic_knob" format="reference" />
-    <attr name="ic_list" format="reference" />
-    <attr name="ic_loading" format="reference" />
-    <attr name="ic_lock" format="reference" />
-    <attr name="ic_lock_open" format="reference" />
-    <attr name="ic_mail" format="reference" />
-    <attr name="ic_menu" format="reference" />
-    <attr name="ic_mute" format="reference" />
-    <attr name="ic_public" format="reference" />
-    <attr name="ic_search" format="reference" />
-    <attr name="ic_setting" format="reference" />
-    <attr name="ic_toot" format="reference" />
-    <attr name="ic_tune" format="reference" />
-    <attr name="ic_unknown" format="reference" />
-    <attr name="ic_hourglass" format="reference" />
-    <attr name="ic_edit" format="reference" />
-    <attr name="ic_hashtag" format="reference" />
-
-    <attr name="ic_follow_plus" format="reference" />
-    <attr name="ic_follow_cross" format="reference" />
-    <attr name="ic_followed_by" format="reference" />
-
-    <attr name="ic_hamburger" format="reference" />
-    <attr name="ic_delete" format="reference" />
-    <attr name="ic_plugin" format="reference" />
-    <attr name="ic_domain_block" format="reference" />
-
-    <attr name="ic_nicoru" format="reference" />
-    <attr name="ic_question" format="reference" />
-    <attr name="ic_eye_off" format="reference" />
-    <attr name="ic_follow_wait" format="reference" />
-    <attr name="ic_list2" format="reference" />
-    <attr name="ic_add" format="reference" />
-    <attr name="ic_list_list" format="reference" />
-    <attr name="ic_list_tl" format="reference" />
-    <attr name="ic_list_member" format="reference" />
-
-    <attr name="ic_download" format="reference" />
-    <attr name="ic_browser" format="reference" />
-    <attr name="ic_share" format="reference" />
-    <attr name="ic_copy" format="reference" />
-    <attr name="ic_left" format="reference" />
-    <attr name="ic_right" format="reference" />
-    <attr name="ic_volume_up" format="reference" />
-    <attr name="ic_face" format="reference" />
-    <attr name="ic_check" format="reference" />
-    <attr name="ic_vote" format="reference" />
-    <attr name="ic_local_home" format="reference" />
-    <attr name="ic_local_lock" format="reference" />
-    <attr name="ic_local_lock_open" format="reference" />
-    <attr name="ic_local_ltl" format="reference" />
-    <attr name="ic_music" format="reference" />
-    <attr name="ic_timer" format="reference" />
+    <!-- VectorDrawableのXMLに指定するfillColor -->
+    <attr name="colorVectorDrawable" format="color"/>
 
 </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 14124cdf..a94e434c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,12 @@
 <resources>
     <color name="Light_colorThumbnailBackground">#20000000</color>
     <color name="Light_colorColumnListItemText">#80000000</color>
+
+
     <color name="Light_colorTimeSmall">#ff666666</color>
     <color name="Light_colorContentText">#ff333333</color>
     <color name="Light_colorColumnHeaderName">#616161</color>
+    <color name="Light_colorVectorDrawable">#616161</color>
 
     <color name="Light_colorColumnHeaderAcct">#80000000</color>
     <color name="Light_colorColumnHeaderPageNumber">#80000000</color>
@@ -62,6 +65,7 @@
     <color name="Dark_colorColumnHeaderPageNumber">#66FFFFFF</color>
     <color name="Dark_colorSettingDivider">#66FFFFFF</color><!-- ダイアログ背景が#424242なので、それより明るくないといけない -->
     <color name="Dark_colorColumnHeaderName">#e4e4e4</color>
+    <color name="Dark_colorVectorDrawable">#e4e4e4</color>
 
     <color name="Dark_colorImageButton">#ccFFFFFF</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d66cf456..c845f586 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -687,7 +687,7 @@
     <string name="cant_change_account_when_redraft">Can\'t change account while using redraft.</string>
     <string name="delete_base_status_before_toot">Delete base status before posting.  All of favourites/boosts will be lost. Replies will be disconnected. Media attachments will not kept on Mastodon pre-2.4.1 . Are you sure?</string>
     <string name="notification_tl_font_size">Notification TL font size (Unit:sp. leave empty to default. app restart required)</string>
-    <string name="notification_tl_icon_size">Notification TL icon size (Unit:dp. default:32. app restart required)</string>
+    <string name="notification_tl_icon_size">Notification TL icon size (Unit:dp. default:24. app restart required)</string>
     <string name="post_button_tapped_repeatly">Post button was tapped repeatedly</string>
     <string name="regex_filter_matches_empty_string">Regex filter matches to empty string.</string>
     <string name="follow_suggestion">Follow suggestion</string>
@@ -863,9 +863,9 @@
     <string name="cant_change_account_when_editing_scheduled_status">Can\'t change account when editing scheduled status.</string>
     <string name="delete_scheduled_status_before_update">Delete scheduled status before posting. Are you sure?</string>
     <string name="reply_icon_size">Reply icon size(Unit:dp. default:24. app restart required)</string>
-    <string name="header_icon_size">Header icon size(Unit:dp. default:32. app restart required)</string>
+    <string name="header_icon_size">Header icon size(Unit:dp. default:24. app restart required)</string>
     <string name="header_text_size">Header text size(Unit:sp. default:14. app restart required)</string>
-    <string name="strip_icon_size">Column strip icon size(Unit:dp. default:32. app restart required)</string>
+    <string name="strip_icon_size">Column strip icon size(Unit:dp. default:24. app restart required)</string>
 
     <string name="all">All</string>
     <string name="show_links_in_context_menu">Show links in context menu</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1dd0c853..6629ad71 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -43,81 +43,8 @@
         <item name="colorColumnHeaderName">@color/Light_colorColumnHeaderName</item>
         <item name="colorButtonBg">@color/Light_colorButtonBg</item>
         <item name="colorRefreshErrorBg">@color/Light_colorRefreshErrorBg</item>
+        <item name="colorVectorDrawable">@color/Light_colorVectorDrawable</item>
 
-        <item name="btn_attachment">@drawable/btn_attachment</item>
-        <item name="btn_boost">@drawable/btn_boost</item>
-        <item name="btn_close">@drawable/btn_close</item>
-        <item name="btn_favourite">@drawable/btn_favourite</item>
-        <item name="btn_federate_tl">@drawable/btn_federate_tl</item>
-        <item name="btn_home">@drawable/btn_home</item>
-        <item name="btn_local_tl">@drawable/btn_local_tl</item>
-        <item name="btn_more">@drawable/btn_more</item>
-        <item name="btn_notification">@drawable/btn_notification</item>
-        <item name="btn_post">@drawable/btn_post</item>
-        <item name="btn_refresh">@drawable/btn_refresh</item>
-        <item name="btn_reply">@drawable/btn_reply</item>
-        <item name="btn_statuses">@drawable/btn_statuses</item>
-        <item name="ic_account_add">@drawable/ic_account_add</item>
-        <item name="ic_block">@drawable/ic_block</item>
-        <item name="ic_bookmark">@drawable/ic_bookmark</item>
-        <item name="ic_conversation">@drawable/ic_conversation</item>
-        <item name="ic_hot_tub">@drawable/ic_hot_tub</item>
-        <item name="ic_info">@drawable/ic_info</item>
-        <item name="ic_knob">@drawable/ic_knob</item>
-        <item name="ic_list">@drawable/ic_list</item>
-        <item name="ic_loading">@drawable/ic_loading</item>
-        <item name="ic_lock">@drawable/ic_lock</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open</item>
-        <item name="ic_mail">@drawable/ic_mail</item>
-        <item name="ic_menu">@drawable/ic_menu</item>
-        <item name="ic_mute">@drawable/ic_mute</item>
-        <item name="ic_public">@drawable/ic_public</item>
-        <item name="ic_search">@drawable/ic_search</item>
-        <item name="ic_setting">@drawable/ic_setting</item>
-        <item name="ic_toot">@drawable/ic_toot</item>
-        <item name="ic_tune">@drawable/ic_tune</item>
-        <item name="ic_unknown">@drawable/ic_unknown</item>
-        <item name="ic_hourglass">@drawable/ic_hourglass</item>
-        <item name="ic_edit">@drawable/ic_edit</item>
-        <item name="ic_hashtag">@drawable/ic_hashtag</item>
-
-        <item name="ic_follow_plus">@drawable/ic_follow_plus</item>
-        <item name="ic_follow_cross">@drawable/ic_follow_cross</item>
-        <item name="ic_followed_by">@drawable/ic_followed_by</item>
-
-        <item name="ic_hamburger">@drawable/ic_hamburger</item>
-        <item name="ic_delete">@drawable/ic_delete</item>
-        <item name="ic_plugin">@drawable/ic_plugin</item>
-        <item name="ic_domain_block">@drawable/ic_domain_block</item>
-
-        <item name="ic_nicoru">@drawable/ic_nicoru</item>
-        <item name="ic_question">@drawable/ic_question</item>
-        <item name="ic_eye_off">@drawable/ic_eye_off</item>
-        <item name="ic_follow_wait">@drawable/ic_follow_wait</item>
-        <item name="ic_list2">@drawable/ic_list2</item>
-        <item name="ic_add">@drawable/ic_add</item>
-
-        <item name="ic_list_list">@drawable/ic_list_list</item>
-        <item name="ic_list_tl">@drawable/ic_list_tl</item>
-        <item name="ic_list_member">@drawable/ic_list_member</item>
-
-        <item name="ic_download">@drawable/ic_download</item>
-        <item name="ic_browser">@drawable/ic_browser</item>
-        <item name="ic_share">@drawable/ic_share</item>
-        <item name="ic_copy">@drawable/ic_copy</item>
-        <item name="ic_left">@drawable/ic_left</item>
-        <item name="ic_right">@drawable/ic_right</item>
-        <item name="ic_volume_up">@drawable/ic_volume_up</item>
-        <item name="ic_face">@drawable/ic_face</item>
-        <item name="ic_check">@drawable/ic_check</item>
-        <item name="ic_vote">@drawable/ic_vote</item>
-
-        <item name="ic_local_home">@drawable/ic_local_home</item>
-        <item name="ic_local_lock">@drawable/ic_local_lock</item>
-        <item name="ic_local_lock_open">@drawable/ic_local_lock_open</item>
-        <item name="ic_local_ltl">@drawable/ic_local_ltl</item>
-        <item name="ic_music">@drawable/ic_music</item>
-        <item name="ic_timer">@drawable/ic_timer</item>
 
     </style>
 
@@ -173,79 +100,7 @@
         <item name="colorButtonBg">@color/Dark_colorButtonBg</item>
         <item name="colorRefreshErrorBg">@color/Dark_colorRefreshErrorBg</item>
 
-        <item name="btn_attachment">@drawable/btn_attachment_dark</item>
-        <item name="btn_boost">@drawable/btn_boost_dark</item>
-        <item name="btn_close">@drawable/btn_close_dark</item>
-        <item name="btn_favourite">@drawable/btn_favourite_dark</item>
-        <item name="btn_federate_tl">@drawable/btn_federate_tl_dark</item>
-        <item name="btn_home">@drawable/btn_home_dark</item>
-        <item name="btn_local_tl">@drawable/btn_local_tl_dark</item>
-        <item name="btn_more">@drawable/btn_more_dark</item>
-        <item name="btn_notification">@drawable/btn_notification_dark</item>
-        <item name="btn_post">@drawable/btn_post_dark</item>
-        <item name="btn_refresh">@drawable/btn_refresh_dark</item>
-        <item name="btn_reply">@drawable/btn_reply_dark</item>
-        <item name="btn_statuses">@drawable/btn_statuses_dark</item>
-        <item name="ic_account_add">@drawable/ic_account_add_dark</item>
-        <item name="ic_block">@drawable/ic_block_dark</item>
-        <item name="ic_bookmark">@drawable/ic_bookmark_dark</item>
-        <item name="ic_conversation">@drawable/ic_conversation_dark</item>
-        <item name="ic_hot_tub">@drawable/ic_hot_tub_dark</item>
-        <item name="ic_info">@drawable/ic_info_dark</item>
-        <item name="ic_knob">@drawable/ic_knob_dark</item>
-        <item name="ic_list">@drawable/ic_list_dark</item>
-        <item name="ic_loading">@drawable/ic_loading_dark</item>
-        <item name="ic_lock">@drawable/ic_lock_dark</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open_dark</item>
-        <item name="ic_mail">@drawable/ic_mail_dark</item>
-        <item name="ic_menu">@drawable/ic_menu_dark</item>
-        <item name="ic_mute">@drawable/ic_mute_dark</item>
-        <item name="ic_public">@drawable/ic_public_dark</item>
-        <item name="ic_search">@drawable/ic_search_dark</item>
-        <item name="ic_setting">@drawable/ic_setting_dark</item>
-        <item name="ic_toot">@drawable/ic_toot_dark</item>
-        <item name="ic_tune">@drawable/ic_tune_dark</item>
-        <item name="ic_unknown">@drawable/ic_unknown_dark</item>
-        <item name="ic_hourglass">@drawable/ic_hourglass_dark</item>
-        <item name="ic_edit">@drawable/ic_edit_dark</item>
-        <item name="ic_hashtag">@drawable/ic_hashtag_dark</item>
-
-        <item name="ic_follow_plus">@drawable/ic_follow_plus_dark</item>
-        <item name="ic_follow_cross">@drawable/ic_follow_cross_dark</item>
-        <item name="ic_followed_by">@drawable/ic_followed_by_dark</item>
-
-        <item name="ic_hamburger">@drawable/ic_hamburger_dark</item>
-        <item name="ic_delete">@drawable/ic_delete_dark</item>
-        <item name="ic_plugin">@drawable/ic_plugin_dark</item>
-        <item name="ic_domain_block">@drawable/ic_domain_block_dark</item>
-
-        <item name="ic_nicoru">@drawable/ic_nicoru_dark</item>
-        <item name="ic_question">@drawable/ic_question_dark</item>
-        <item name="ic_eye_off">@drawable/ic_eye_off_dark</item>
-        <item name="ic_follow_wait">@drawable/ic_follow_wait_dark</item>
-        <item name="ic_list2">@drawable/ic_list2_dark</item>
-        <item name="ic_add">@drawable/ic_add_dark</item>
-        <item name="ic_list_list">@drawable/ic_list_list_dark</item>
-        <item name="ic_list_tl">@drawable/ic_list_tl_dark</item>
-        <item name="ic_list_member">@drawable/ic_list_member_dark</item>
-
-        <item name="ic_download">@drawable/ic_download_dark</item>
-        <item name="ic_browser">@drawable/ic_browser_dark</item>
-        <item name="ic_share">@drawable/ic_share_dark</item>
-        <item name="ic_copy">@drawable/ic_copy_dark</item>
-        <item name="ic_left">@drawable/ic_left_dark</item>
-        <item name="ic_right">@drawable/ic_right_dark</item>
-        <item name="ic_volume_up">@drawable/ic_volume_up_dark</item>
-        <item name="ic_face">@drawable/ic_face_dark</item>
-        <item name="ic_check">@drawable/ic_check_dark</item>
-        <item name="ic_vote">@drawable/ic_vote_dark</item>
-
-        <item name="ic_local_home">@drawable/ic_local_home_dark</item>
-        <item name="ic_local_lock">@drawable/ic_local_lock_dark</item>
-        <item name="ic_local_lock_open">@drawable/ic_local_lock_open_dark</item>
-        <item name="ic_local_ltl">@drawable/ic_local_ltl_dark</item>
-        <item name="ic_music">@drawable/ic_music_dark</item>
-        <item name="ic_timer">@drawable/ic_timer_dark</item>
+        <item name="colorVectorDrawable">@color/Dark_colorVectorDrawable</item>
 
     </style>
 
diff --git a/fixIconAlpha.pl b/fixIconAlpha.pl
index cbd36801..fcf8b6e1 100644
--- a/fixIconAlpha.pl
+++ b/fixIconAlpha.pl
@@ -85,29 +85,34 @@ Loop: for( my $y = 0; $y < $height ;++$y){
 	$relpath=~ /drawable-(\w+)/;
 	my $density = $density{ $1 };
 
-#	if( $density and !$isColor){
-#		my $dp_w = int(0.5 + $width/$density);
-#		my $dp_h = int(0.5 + $height/$density);
-#		if( $dp_w == 32 && $dp_h == 32 ){
-#			say "${dp_w}x${dp_h}dp, alphaMax=$alphaMax, isColor=${isColor}, $relpath";
-#
-#			# create trimmed
-#			my $trim_w = int(0.5 + $width * 24/32);
-#			my $trim_h = int(0.5 + $height * 24/32);
-#			my $offsetX = int($width-$trim_w)/2;
-#			my $offsetY = int($width-$trim_w)/2;
-#
-#			my $i2 = GD::Image->newTrueColor($trim_w,$trim_h);
-#			$i2->alphaBlending(0);
-#			$i2->filledRectangle(0,0,$trim_w,$trim_h, $image->colorAllocateAlpha(0,0,0,127));
-#			$i2->alphaBlending(1);
-#			$i2->copy($image,0,0,$offsetX,$offsetY,$trim_w,$trim_h);
-#
-#			my $dstfile = "$trimdir/$relpath";
-#			return if not $dstfile =~ s/(png|webp)\z/png/i;
-#			savePng($i2,$dstfile);
-#		}
-#	}
+	if( $density and !$isColor){
+		my $dp_w = int(0.5 + $width/$density);
+		my $dp_h = int(0.5 + $height/$density);
+		if( $dp_w == 32 && $dp_h == 32 && 0 ){
+			say "${dp_w}x${dp_h}dp, alphaMax=$alphaMax, isColor=${isColor}, $relpath";
+
+			my $dstfile = "$trimdir/$relpath";
+			if( $dstfile =~ s/(png|webp)\z/png/i ){
+				if(0){
+					# create trimmed
+					my $trim_w = int(0.5 + $width * 24/32);
+					my $trim_h = int(0.5 + $height * 24/32);
+					my $offsetX = int($width-$trim_w)/2;
+					my $offsetY = int($width-$trim_w)/2;
+
+					my $i2 = GD::Image->newTrueColor($trim_w,$trim_h);
+					$i2->alphaBlending(0);
+					$i2->filledRectangle(0,0,$trim_w,$trim_h, $image->colorAllocateAlpha(0,0,0,127));
+					$i2->alphaBlending(1);
+					$i2->copy($image,0,0,$offsetX,$offsetY,$trim_w,$trim_h);
+
+					savePng($i2,$dstfile);
+				}else{
+					savePng($image,$dstfile);
+				}
+			}
+		}
+	}
 
 	return if $isColor;
 	return if $alphaMax == 0;
diff --git a/resizeLauncherIcon.pl b/resizeLauncherIcon.pl
index 65274929..0f4a3567 100644
--- a/resizeLauncherIcon.pl
+++ b/resizeLauncherIcon.pl
@@ -78,7 +78,6 @@ my $res_dir = "app/src/main/res";
 #resize_scales( "_ArtWork/ic_notification_20150513.png"	,$res_dir,"drawable","ic_notification",0,24);
 #
 #
-#resize_scales( "_ArtWork/ic_hourglass.png"			,$res_dir,"drawable","ic_hourglass",0,32);
 #resize_scales( "_ArtWork/ic_hourglass_dark.png"		,$res_dir,"drawable","ic_hourglass_dark",0,32);
 #
 #
@@ -103,15 +102,7 @@ my $res_dir = "app/src/main/res";
 #resize_scales( "_ArtWork/ic_pin.png"	,$res_dir,"drawable","ic_pin",0,32);
 #resize_scales( "_ArtWork/ic_pin_dark.png"	,$res_dir,"drawable","ic_pin_dark",0,32);
 
-#resize_scales( "_ArtWork/ic_follow_wait.png"	,$res_dir,"drawable","ic_follow_wait",0,32);
-#resize_scales( "_ArtWork/ic_follow_wait_dark.png"	,$res_dir,"drawable","ic_follow_wait_dark",0,32);
 
-#resize_scales( "_ArtWork/ic_list_list.png"	,$res_dir,"drawable","ic_list_list",0,32);
-#resize_scales( "_ArtWork/ic_list_tl.png"	,$res_dir,"drawable","ic_list_tl",0,32);
-#resize_scales( "_ArtWork/ic_list_member.png"	,$res_dir,"drawable","ic_list_member",0,32);
-#resize_scales( "_ArtWork/ic_list_list_dark.png"	,$res_dir,"drawable","ic_list_list_dark",0,32);
-#resize_scales( "_ArtWork/ic_list_tl_dark.png"	,$res_dir,"drawable","ic_list_tl_dark",0,32);
-#resize_scales( "_ArtWork/ic_list_member_dark.png"	,$res_dir,"drawable","ic_list_member_dark",0,32);
 
 #resize_scales( "_ArtWork/v0.5.1/ic_launcher_foreground.png"		,$res_dir,"mipmap","ic_launcher_foreground",0,108);
 #resize_scales( "_ArtWork/v0.5.1/ic_launcher_background.png"		,$res_dir,"mipmap","ic_launcher_background",0,108);
@@ -141,7 +132,6 @@ my $res_dir = "app/src/main/res";
 
 #resize_scales( "../extra-SubwayTooter/_ArtWork/ic_unread.png"	,$res_dir,"drawable","ic_unread",0,24);
 
-#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_blocked_by.png"	,$res_dir,"drawable","ic_blocked_by",0,32);
 #resize_scales( "../extra-SubwayTooter/_ArtWork/ic_requested_by.png"	,$res_dir,"drawable","ic_requested_by",0,32);
 
 
@@ -157,4 +147,31 @@ my $res_dir = "app/src/main/res";
 
 # resize_scales( "../extra-SubwayTooter/_ArtWork/media_bg_dark.png"	,$res_dir,"drawable","media_bg_dark",0,24);
 
-resize_scales( "../extra-SubwayTooter/_ArtWork/nicodic.png"	,$res_dir,"drawable","nicodic",32,60);
+# resize_scales( "../extra-SubwayTooter/_ArtWork/nicodic.png"	,$res_dir,"drawable","nicodic",32,60);
+
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_blocked_by.png"	,$res_dir,"drawable","ic_blocked_by",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_follow_wait.png"	,$res_dir,"drawable","ic_follow_wait",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_follow_cross.png"		,$res_dir,"drawable","ic_follow_cross",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_follow_plus.png"		,$res_dir,"drawable","ic_follow_plus",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_followed_by.png"		,$res_dir,"drawable","ic_followed_by",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_followed_by_dark.png"	,$res_dir,"drawable","ic_followed_by_dark",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_list_list.png"	,$res_dir,"drawable","ic_list_list",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_list_tl.png"	,$res_dir,"drawable","ic_list_tl",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_list_member.png"	,$res_dir,"drawable","ic_list_member",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_hashtag.png"	,$res_dir,"drawable","ic_hashtag",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_hourglass.png"			,$res_dir,"drawable","ic_hourglass",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_home.png"	,$res_dir,"drawable","ic_local_home",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_home_dark.png"	,$res_dir,"drawable","ic_local_home_dark",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_lock.png"	,$res_dir,"drawable","ic_local_lock",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_lock_dark.png"	,$res_dir,"drawable","ic_local_lock_dark",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_lock_open.png"	,$res_dir,"drawable","ic_local_lock_open",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_lock_open_dark.png"	,$res_dir,"drawable","ic_local_lock_open_dark",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_ltl.png"	,$res_dir,"drawable","ic_local_ltl",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/local-visibility/ic_local_ltl_dark.png"	,$res_dir,"drawable","ic_local_ltl_dark",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_nicoru.png"			,$res_dir,"drawable","ic_nicoru",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_pulse.png"	,$res_dir,"drawable","ic_pulse",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_requested_by.png"	,$res_dir,"drawable","ic_requested_by",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_vote.png"	,$res_dir,"drawable","ic_vote",0,24);
+#resize_scales( "../extra-SubwayTooter/_ArtWork/ic_hashtag.png"	,$res_dir,"drawable","ic_hashtag",0,24);
+
+resize_scales( "../extra-SubwayTooter/_ArtWork/ic_followed_by.png"		,$res_dir,"drawable","ic_followed_by",0,24);