diff --git a/images/mug.svg b/images/mug.svg
index 2194d01eff..6e057a05b9 100644
--- a/images/mug.svg
+++ b/images/mug.svg
@@ -1,22 +1,12 @@
 <svg width="76" height="84" viewBox="0 0 76 84" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-inside-1" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.3334 71.9999C68.0472 71.9999 75.1112 64.9359 75.1112 56.2221C75.1112 47.5083 68.0472 40.4443 59.3334 40.4443C50.6196 40.4443 43.5556 47.5083 43.5556 56.2221C43.5556 64.9359 50.6196 71.9999 59.3334 71.9999ZM59.3334 62.1383C62.6007 62.1383 65.2493 59.4896 65.2493 56.2223C65.2493 52.955 62.6007 50.3064 59.3334 50.3064C56.0661 50.3064 53.4174 52.955 53.4174 56.2223C53.4174 59.4896 56.0661 62.1383 59.3334 62.1383Z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M58.6876 40.4155H5V72.0001C5 78.6275 10.3726 84.0001 17 84.0001H46.6876C52.9786 84.0001 58.1389 79.1592 58.6466 72.9992C66.0184 72.9175 71.5 66.6812 71.5 59C71.5 51.3331 66.0387 45.5973 58.6876 45.5012V40.4155ZM58.6876 55.0039V63.495C60.9101 63.377 63 61.1878 63 59C63 56.8122 60.9101 55.0961 58.6876 55.0039Z" fill="#DDD7CE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.6034 52H27.6666V67.63C29.2886 67.63 30.6034 66.3152 30.6034 64.6932V61.0629C31.2889 61.4369 32.0751 61.6494 32.9109 61.6494C35.5755 61.6494 37.7356 59.4893 37.7356 56.8247C37.7356 54.2304 35.6879 52.1143 33.1206 52.0045V52H32.9109H30.6034H30.6034Z" fill="#5C5450"/>
+<mask id="path-3-inside-1_2564_18248" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.55554 28.4443C3.24183 28.4443 0.555542 31.1306 0.555542 34.4443C0.555542 37.2201 2.44039 39.5555 5 40.2407V72.0002C5 78.6276 10.3726 84.0002 17 84.0002H46.6876C51.5886 84.0002 55.8033 81.0622 57.6666 76.8514V76.9999C67.485 76.9999 75.4444 69.0405 75.4444 59.2221C75.4444 49.7464 68.0309 42.0022 58.6876 41.4732V40.134C61.065 39.3363 62.7778 37.0903 62.7778 34.4443C62.7778 31.1306 60.0915 28.4443 56.7778 28.4443H6.55554ZM9 40.4443H54.6876V72.0002C54.6876 76.4185 51.1059 80.0002 46.6876 80.0002H17C12.5817 80.0002 9 76.4185 9 72.0002V40.4443ZM71.4444 59.2221C71.4444 66.5009 65.8 72.4614 58.6494 72.9654C58.6747 72.647 58.6876 72.3251 58.6876 72.0002V67.1381C63.0498 67.1267 66.5826 63.587 66.5826 59.2221C66.5826 54.8573 63.0498 51.3175 58.6876 51.3062V45.4816C65.8201 46.0041 71.4444 51.9563 71.4444 59.2221ZM62.5826 59.2221C62.5826 61.3778 60.8407 63.1267 58.6876 63.138V55.3062C60.8407 55.3175 62.5826 57.0664 62.5826 59.2221Z"/>
 </mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.3334 71.9999C68.0472 71.9999 75.1112 64.9359 75.1112 56.2221C75.1112 47.5083 68.0472 40.4443 59.3334 40.4443C50.6196 40.4443 43.5556 47.5083 43.5556 56.2221C43.5556 64.9359 50.6196 71.9999 59.3334 71.9999ZM59.3334 62.1383C62.6007 62.1383 65.2493 59.4896 65.2493 56.2223C65.2493 52.955 62.6007 50.3064 59.3334 50.3064C56.0661 50.3064 53.4174 52.955 53.4174 56.2223C53.4174 59.4896 56.0661 62.1383 59.3334 62.1383Z" fill="#DDD7CE"/>
-<path d="M71.1112 56.2221C71.1112 62.7268 65.8381 67.9999 59.3334 67.9999V75.9999C70.2563 75.9999 79.1112 67.1451 79.1112 56.2221H71.1112ZM59.3334 44.4443C65.8381 44.4443 71.1112 49.7174 71.1112 56.2221H79.1112C79.1112 45.2991 70.2563 36.4443 59.3334 36.4443V44.4443ZM47.5556 56.2221C47.5556 49.7174 52.8287 44.4443 59.3334 44.4443V36.4443C48.4104 36.4443 39.5556 45.2991 39.5556 56.2221H47.5556ZM59.3334 67.9999C52.8287 67.9999 47.5556 62.7268 47.5556 56.2221H39.5556C39.5556 67.1451 48.4104 75.9999 59.3334 75.9999V67.9999ZM61.2493 56.2223C61.2493 57.2805 60.3915 58.1383 59.3334 58.1383V66.1383C64.8098 66.1383 69.2493 61.6988 69.2493 56.2223H61.2493ZM59.3334 54.3064C60.3915 54.3064 61.2493 55.1642 61.2493 56.2223H69.2493C69.2493 50.7459 64.8098 46.3064 59.3334 46.3064V54.3064ZM57.4174 56.2223C57.4174 55.1642 58.2752 54.3064 59.3334 54.3064V46.3064C53.8569 46.3064 49.4174 50.7459 49.4174 56.2223H57.4174ZM59.3334 58.1383C58.2752 58.1383 57.4174 57.2805 57.4174 56.2223H49.4174C49.4174 61.6988 53.8569 66.1383 59.3334 66.1383V58.1383Z" fill="#5C5450" mask="url(#path-1-inside-1)"/>
-<path d="M7.33337 37.1113H57.021V72.0002C57.021 77.5231 52.5439 82.0002 47.021 82.0002H17.3334C11.8105 82.0002 7.33337 77.5231 7.33337 72.0002V37.1113Z" fill="#DDD7CE" stroke="#5C5450" stroke-width="4"/>
-<circle cx="33.2443" cy="56.8247" r="4.82471" fill="#5C5450"/>
-<rect x="30.9368" y="52" width="2.51724" height="2.51724" fill="#5C5450"/>
-<path d="M28 52H30.9368V64.6932C30.9368 66.3152 29.6219 67.63 28 67.63V52Z" fill="url(#paint0_linear)"/>
-<path d="M28 52H30.9368V64.6932C30.9368 66.3152 29.6219 67.63 28 67.63V52Z" fill="#5C5450"/>
-<rect x="2.88892" y="30.4443" width="58.2222" height="8" rx="4" fill="#7B809C" stroke="#5C5450" stroke-width="4"/>
-<path d="M18.7625 5.55705C18.5064 5.85135 18.1736 6.33499 17.8531 6.99549C16.6108 9.55556 16.6108 12.597 18.6187 15.7812C20.0287 18.0172 20.0285 20.3268 19.17 22.4958C19.0444 22.813 18.9109 23.0954 18.7797 23.3369C18.7071 23.4707 18.6569 23.5533 18.6396 23.5792C18.1543 24.3065 18.3689 25.2776 19.119 25.7482C19.8691 26.2188 20.8706 26.0107 21.3559 25.2834C21.5839 24.9417 21.8913 24.3759 22.1905 23.6199C23.3789 20.6176 23.3791 17.3166 21.379 14.1447C19.9766 11.9208 19.9766 9.98779 20.7806 8.33107C20.9716 7.93736 21.1503 7.67771 21.2352 7.58011C21.8114 6.91802 21.7249 5.92842 21.0421 5.36977C20.3593 4.81112 19.3387 4.89497 18.7625 5.55705Z" fill="#7F7F7F"/>
-<path d="M29.7625 0.557052C29.5064 0.851347 29.1736 1.33499 28.8531 1.99549C27.6108 4.55556 27.6108 7.59697 29.6187 10.7812C31.0287 13.0172 31.0285 15.3268 30.17 17.4958C30.0444 17.813 29.9109 18.0954 29.7797 18.3369C29.7071 18.4707 29.6569 18.5533 29.6396 18.5792C29.1543 19.3065 29.3689 20.2776 30.119 20.7482C30.8691 21.2188 31.8706 21.0107 32.3559 20.2834C32.5839 19.9417 32.8913 19.3759 33.1905 18.6199C34.3789 15.6176 34.3791 12.3166 32.379 9.14472C30.9766 6.92083 30.9766 4.98779 31.7806 3.33107C31.9716 2.93736 32.1503 2.67771 32.2352 2.58011C32.8114 1.91802 32.7249 0.928422 32.0421 0.36977C31.3593 -0.188882 30.3387 -0.105033 29.7625 0.557052Z" fill="#808080"/>
-<path d="M40.7625 5.55705C40.5064 5.85135 40.1736 6.33499 39.8531 6.99549C38.6108 9.55556 38.6108 12.597 40.6187 15.7812C42.0287 18.0172 42.0285 20.3268 41.17 22.4958C41.0444 22.813 40.9109 23.0954 40.7797 23.3369C40.7071 23.4707 40.6569 23.5533 40.6396 23.5792C40.1543 24.3065 40.3689 25.2776 41.119 25.7482C41.8691 26.2188 42.8706 26.0107 43.3559 25.2834C43.5839 24.9417 43.8913 24.3759 44.1905 23.6199C45.3789 20.6176 45.3791 17.3166 43.379 14.1447C41.9766 11.9208 41.9766 9.98779 42.7806 8.33107C42.9716 7.93736 43.1503 7.67771 43.2352 7.58011C43.8114 6.91802 43.7249 5.92842 43.0421 5.36977C42.3593 4.81112 41.3387 4.89497 40.7625 5.55705Z" fill="#7F7F7F"/>
-<defs>
-<linearGradient id="paint0_linear" x1="29.4684" y1="52" x2="29.4684" y2="67.63" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4E6287"/>
-<stop offset="1" stop-color="#E56A45"/>
-</linearGradient>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.55554 28.4443C3.24183 28.4443 0.555542 31.1306 0.555542 34.4443C0.555542 37.2201 2.44039 39.5555 5 40.2407V72.0002C5 78.6276 10.3726 84.0002 17 84.0002H46.6876C51.5886 84.0002 55.8033 81.0622 57.6666 76.8514V76.9999C67.485 76.9999 75.4444 69.0405 75.4444 59.2221C75.4444 49.7464 68.0309 42.0022 58.6876 41.4732V40.134C61.065 39.3363 62.7778 37.0903 62.7778 34.4443C62.7778 31.1306 60.0915 28.4443 56.7778 28.4443H6.55554ZM9 40.4443H54.6876V72.0002C54.6876 76.4185 51.1059 80.0002 46.6876 80.0002H17C12.5817 80.0002 9 76.4185 9 72.0002V40.4443ZM71.4444 59.2221C71.4444 66.5009 65.8 72.4614 58.6494 72.9654C58.6747 72.647 58.6876 72.3251 58.6876 72.0002V67.1381C63.0498 67.1267 66.5826 63.587 66.5826 59.2221C66.5826 54.8573 63.0498 51.3175 58.6876 51.3062V45.4816C65.8201 46.0041 71.4444 51.9563 71.4444 59.2221ZM62.5826 59.2221C62.5826 61.3778 60.8407 63.1267 58.6876 63.138V55.3062C60.8407 55.3175 62.5826 57.0664 62.5826 59.2221Z" fill="#7B809C"/>
+<path d="M5 40.2407H9V37.1707L6.03434 36.3768L5 40.2407ZM57.6666 76.8514H61.6666L54.0088 75.2328L57.6666 76.8514ZM57.6666 76.9999H53.6666V80.9999H57.6666V76.9999ZM58.6876 41.4732H54.6876V45.2531L58.4615 45.4668L58.6876 41.4732ZM58.6876 40.134L57.4152 36.3418L54.6876 37.257V40.134H58.6876ZM54.6876 40.4443H58.6876V36.4443H54.6876V40.4443ZM9 40.4443V36.4443H5V40.4443H9ZM58.6494 72.9654L54.662 72.6481L54.2932 77.2823L58.9306 76.9555L58.6494 72.9654ZM58.6876 67.1381L58.6772 63.1381L54.6876 63.1484V67.1381H58.6876ZM58.6876 51.3062H54.6876V55.2958L58.6772 55.3062L58.6876 51.3062ZM58.6876 45.4816L58.9799 41.4923L54.6876 41.1779V45.4816H58.6876ZM58.6876 63.138H54.6876V67.1591L58.7087 67.138L58.6876 63.138ZM58.6876 55.3062L58.7087 51.3063L54.6876 51.2851V55.3062H58.6876ZM4.55554 34.4443C4.55554 33.3398 5.45097 32.4443 6.55554 32.4443V24.4443C1.03269 24.4443 -3.44446 28.9215 -3.44446 34.4443H4.55554ZM6.03434 36.3768C5.17977 36.148 4.55554 35.364 4.55554 34.4443H-3.44446C-3.44446 39.0761 -0.298992 42.9631 3.96566 44.1047L6.03434 36.3768ZM9 72.0002V40.2407H1V72.0002H9ZM17 80.0002C12.5817 80.0002 9 76.4185 9 72.0002H1C1 80.8368 8.16345 88.0002 17 88.0002V80.0002ZM46.6876 80.0002H17V88.0002H46.6876V80.0002ZM54.0088 75.2328C52.7628 78.0485 49.9487 80.0002 46.6876 80.0002V88.0002C53.2284 88.0002 58.8438 84.076 61.3245 78.4701L54.0088 75.2328ZM61.6666 76.9999V76.8514H53.6666V76.9999H61.6666ZM71.4444 59.2221C71.4444 66.8314 65.2759 72.9999 57.6666 72.9999V80.9999C69.6942 80.9999 79.4444 71.2496 79.4444 59.2221H71.4444ZM58.4615 45.4668C65.699 45.8766 71.4444 51.8798 71.4444 59.2221H79.4444C79.4444 47.613 70.3629 38.1278 58.9138 37.4796L58.4615 45.4668ZM54.6876 40.134V41.4732H62.6876V40.134H54.6876ZM58.7778 34.4443C58.7778 35.3202 58.2123 36.0743 57.4152 36.3418L59.9601 43.9262C63.9177 42.5983 66.7778 38.8605 66.7778 34.4443H58.7778ZM56.7778 32.4443C57.8823 32.4443 58.7778 33.3398 58.7778 34.4443H66.7778C66.7778 28.9215 62.3006 24.4443 56.7778 24.4443V32.4443ZM6.55554 32.4443H56.7778V24.4443H6.55554V32.4443ZM54.6876 36.4443H9V44.4443H54.6876V36.4443ZM50.6876 40.4443V72.0002H58.6876V40.4443H50.6876ZM50.6876 72.0002C50.6876 74.2094 48.8968 76.0002 46.6876 76.0002V84.0002C53.3151 84.0002 58.6876 78.6276 58.6876 72.0002H50.6876ZM46.6876 76.0002H17V84.0002H46.6876V76.0002ZM17 76.0002C14.7909 76.0002 13 74.2094 13 72.0002H5C5 78.6276 10.3726 84.0002 17 84.0002V76.0002ZM13 72.0002V40.4443H5V72.0002H13ZM58.9306 76.9555C68.1611 76.305 75.4444 68.6158 75.4444 59.2221H67.4444C67.4444 64.386 63.4389 68.6179 58.3682 68.9753L58.9306 76.9555ZM54.6876 72.0002C54.6876 72.2191 54.6789 72.4351 54.662 72.6481L62.6368 73.2827C62.6705 72.8589 62.6876 72.4311 62.6876 72.0002H54.6876ZM54.6876 67.1381V72.0002H62.6876V67.1381H54.6876ZM62.5826 59.2221C62.5826 61.3813 60.8349 63.1325 58.6772 63.1381L58.698 71.138C65.2647 71.121 70.5826 65.7926 70.5826 59.2221H62.5826ZM58.6772 55.3062C60.8349 55.3118 62.5826 57.0629 62.5826 59.2221H70.5826C70.5826 52.6516 65.2647 47.3233 58.698 47.3062L58.6772 55.3062ZM54.6876 45.4816V51.3062H62.6876V45.4816H54.6876ZM75.4444 59.2221C75.4444 49.8451 68.1871 42.1667 58.9799 41.4923L58.3954 49.4709C63.4532 49.8414 67.4444 54.0675 67.4444 59.2221H75.4444ZM58.7087 67.138C63.0615 67.1151 66.5826 63.5799 66.5826 59.2221H58.5826C58.5826 59.2221 58.5826 59.2218 58.5826 59.2211C58.5826 59.2205 58.5827 59.2195 58.5828 59.2184C58.5831 59.216 58.5835 59.213 58.5842 59.2095C58.5857 59.2023 58.5879 59.195 58.5908 59.1883C58.5962 59.1754 58.6024 59.1675 58.6071 59.1628C58.6117 59.1581 58.6195 59.152 58.6323 59.1465C58.6477 59.1399 58.6618 59.1381 58.6666 59.1381L58.7087 67.138ZM54.6876 55.3062V63.138H62.6876V55.3062H54.6876ZM66.5826 59.2221C66.5826 54.8643 63.0615 51.3292 58.7087 51.3063L58.6666 59.3062C58.6618 59.3061 58.6477 59.3043 58.6323 59.2977C58.6195 59.2923 58.6117 59.2861 58.6071 59.2814C58.6024 59.2767 58.5962 59.2689 58.5908 59.2559C58.5879 59.2492 58.5857 59.2419 58.5842 59.2347C58.5835 59.2313 58.5831 59.2282 58.5828 59.2259C58.5827 59.2247 58.5826 59.2238 58.5826 59.2231C58.5826 59.2224 58.5826 59.2221 58.5826 59.2221H66.5826Z" fill="#5C5450" mask="url(#path-3-inside-1_2564_18248)"/>
+<path d="M18.4291 5.55705C18.173 5.85135 17.8402 6.33499 17.5197 6.99549C16.2774 9.55556 16.2774 12.597 18.2854 15.7812C19.6954 18.0172 19.6952 20.3268 18.8366 22.4958C18.711 22.813 18.5776 23.0954 18.4464 23.3369C18.3737 23.4707 18.3235 23.5533 18.3063 23.5792C17.8209 24.3065 18.0355 25.2776 18.7856 25.7482C19.5357 26.2188 20.5372 26.0107 21.0226 25.2834C21.2506 24.9417 21.5579 24.3759 21.8571 23.6199C23.0455 20.6176 23.0458 17.3166 21.0456 14.1447C19.6433 11.9208 19.6433 9.98779 20.4472 8.33107C20.6382 7.93736 20.8169 7.67771 20.9019 7.58011C21.478 6.91802 21.3915 5.92842 20.7087 5.36977C20.0259 4.81112 19.0053 4.89497 18.4291 5.55705Z" fill="#7F7F7F"/>
+<path d="M29.4291 0.557052C29.173 0.851347 28.8402 1.33499 28.5197 1.99549C27.2774 4.55556 27.2774 7.59697 29.2854 10.7812C30.6954 13.0172 30.6952 15.3268 29.8366 17.4958C29.711 17.813 29.5776 18.0954 29.4464 18.3369C29.3737 18.4707 29.3235 18.5533 29.3063 18.5792C28.8209 19.3065 29.0355 20.2776 29.7856 20.7482C30.5357 21.2188 31.5372 21.0107 32.0226 20.2834C32.2506 19.9417 32.5579 19.3759 32.8571 18.6199C34.0455 15.6176 34.0458 12.3166 32.0456 9.14472C30.6433 6.92083 30.6433 4.98779 31.4472 3.33107C31.6382 2.93736 31.8169 2.67771 31.9019 2.58011C32.478 1.91802 32.3915 0.928422 31.7087 0.36977C31.0259 -0.188882 30.0053 -0.105033 29.4291 0.557052Z" fill="#808080"/>
+<path d="M40.4291 5.55705C40.173 5.85135 39.8402 6.33499 39.5197 6.99549C38.2774 9.55556 38.2774 12.597 40.2854 15.7812C41.6954 18.0172 41.6952 20.3268 40.8366 22.4958C40.711 22.813 40.5776 23.0954 40.4464 23.3369C40.3737 23.4707 40.3235 23.5533 40.3063 23.5792C39.8209 24.3065 40.0355 25.2776 40.7856 25.7482C41.5357 26.2188 42.5372 26.0107 43.0226 25.2834C43.2506 24.9417 43.5579 24.3759 43.8571 23.6199C45.0455 20.6176 45.0458 17.3166 43.0456 14.1447C41.6433 11.9208 41.6433 9.98779 42.4472 8.33107C42.6382 7.93736 42.8169 7.67771 42.9019 7.58011C43.478 6.91802 43.3915 5.92842 42.7087 5.36977C42.0259 4.81112 41.0053 4.89497 40.4291 5.55705Z" fill="#7F7F7F"/>
 </svg>
diff --git a/lib/domain/initial_setting/pill_sheet_group/initial_setting_pill_sheet_group_page.dart b/lib/domain/initial_setting/pill_sheet_group/initial_setting_pill_sheet_group_page.dart
index fc84c61ea6..99ecfb6573 100644
--- a/lib/domain/initial_setting/pill_sheet_group/initial_setting_pill_sheet_group_page.dart
+++ b/lib/domain/initial_setting/pill_sheet_group/initial_setting_pill_sheet_group_page.dart
@@ -153,6 +153,7 @@ class InitialSettingPillSheetGroupPageBody extends StatelessWidget {
             SizedBox(height: 24),
             PrimaryButton(
                 onPressed: () async {
+                  analytics.logEvent(name: "empty_pill_sheet_type");
                   showSettingPillSheetGroupSelectPillSheetTypePage(
                     context: context,
                     pillSheetType: null,
diff --git a/lib/domain/root/root.dart b/lib/domain/root/root.dart
index 16c371a39f..bd60dc9a9d 100644
--- a/lib/domain/root/root.dart
+++ b/lib/domain/root/root.dart
@@ -116,7 +116,7 @@ class RootState extends State<Root> {
     await remoteConfig.setConfigSettings(
       RemoteConfigSettings(
         minimumFetchInterval: Duration(seconds: 0),
-        fetchTimeout: Duration(seconds: 10),
+        fetchTimeout: Duration(seconds: 30),
       ),
     );
     remoteConfig.setDefaults({