diff --git a/src/bitmessagekivy/kv/inbox.kv b/src/bitmessagekivy/kv/inbox.kv
index 106d2d47..4aadf21f 100644
--- a/src/bitmessagekivy/kv/inbox.kv
+++ b/src/bitmessagekivy/kv/inbox.kv
@@ -29,4 +29,9 @@
                 MDList:
                     id: ml
     Loader:
-    ComposerButton:
\ No newline at end of file
+    ComposerButton:
+
+<TimeTagRightSampleWidget>:
+    size_hint:(None, None)
+    font_style: 'Caption'
+    halign: 'center'
diff --git a/src/bitmessagekivy/kv/maildetail.kv b/src/bitmessagekivy/kv/maildetail.kv
index 4072635f..714e56b6 100644
--- a/src/bitmessagekivy/kv/maildetail.kv
+++ b/src/bitmessagekivy/kv/maildetail.kv
@@ -32,18 +32,21 @@
                 divider: None
                 on_press: root.detailedPopup()
                 BadgeText:
+                    size_hint:(None, None)
+                    size:[120, 140] if app.app_platform == 'android' else [64, 80]
                     text: root.time_tag
-                    halign:'right'
+                    halign:'center'
                     font_style:'Caption'
                     pos_hint: {'center_y': .8}
                     _txt_right_pad: dp(70)
+                    font_size: '11sp'
                 MDChip:
-                    size_hint: (None, None)
+                    size_hint: (.16 if app.app_platform == 'android' else .07 , None)
                     label: root.page_type
                     icon: ''
-                    pos_hint: {'center_x': .94, 'center_y': .3}
+                    pos_hint: {'center_x': .91 if app.app_platform == 'android' else .95, 'center_y': .3}
                     radius: 8
-                    height: 18
+                    height: self.parent.height/4
                 AvatarSampleWidget:
                     source: root.avatarImg
             MDLabel:
diff --git a/src/bitmessagekivy/kv/popup.kv b/src/bitmessagekivy/kv/popup.kv
index e7ee48c3..26ff017c 100644
--- a/src/bitmessagekivy/kv/popup.kv
+++ b/src/bitmessagekivy/kv/popup.kv
@@ -102,7 +102,7 @@
         BoxLayout:
             size_hint_y: None
             orientation: 'vertical'
-            spacing:dp(20)
+            spacing:dp(15)
             MDLabel:
                 font_style: 'Subtitle2'
                 theme_text_color: 'Primary'
@@ -128,6 +128,9 @@
                 text: "Address"
                 font_size: '17sp'
                 halign: 'left'
+            Widget:
+                size_hint_y: None
+                height: dp(1)
             BoxLayout:
                 orientation: 'horizontal'
                 MDLabel:
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 1b3a2b01..dae50156 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -114,22 +114,22 @@ def ShowTimeHistoy(act_time):
 
 def AddTimeWidget(time):  # pylint: disable=redefined-outer-name
     """This method is used to create TimeWidget"""
-    action_time = BadgeText(
-        size_hint=(None, None),
+    action_time = TimeTagRightSampleWidget(
         text=str(ShowTimeHistoy(time)),
-        halign='right',
         font_style='Caption',
-        size=[65, 70])
+        size=[120, 140] if platform == 'android' else [64, 80])
+    action_time.font_size='11sp'
     return action_time
 
 
 def chipTag(text):
     """This method is used for showing chip tag"""
     obj = MDChip()
-    obj.size_hint = (None, None)
+    # obj.size_hint = (None, None)
+    obj.size_hint = (.16 if platform == 'android' else .07 , None)
     obj.label = text
     obj.icon = ''
-    obj.pos_hint = {'center_x': .96, 'center_y': .2}
+    obj.pos_hint = {'center_x': .91 if platform == 'android' else .94, 'center_y': .3}
     obj.height = dp(18)
     obj.radius = 8
     return obj
@@ -420,31 +420,15 @@ class MyAddress(Screen):
             if state.association == item['secondary_text']:
                 badge_obj = BadgeText(
                         size_hint=(None, None),
-                        text='Active', halign='right',
+                        text='Active', halign='center',
                         # font_size = '50sp',
-                        font_style='Body1', size=[50, 60],
+                        font_style='Body1', size=[85 if platform == 'android' else 50, 60],
                         theme_text_color='Custom',
                         text_color=NavigateApp().theme_cls.primary_color)
                 badge_obj.font_size = '13sp'
                 meny.add_widget(badge_obj)
             else:
                 meny.add_widget(ToggleBtn(active=True if is_enable == 'true' else False))
-            # carousel = Carousel(direction='right')
-            # carousel.height = meny.height
-            # carousel.size_hint_y = None
-            # carousel.ignore_perpendicular_swipes = True
-            # carousel.data_index = 0
-            # carousel.min_move = 0.2
-            # del_btn = Button(text='Disable' if is_enable == 'true' else 'Enable')
-            # if is_enable == 'true':
-            #     del_btn.background_normal = ''
-            # del_btn.background_color = (1, 0, 0, 1) if is_enable == 'true' else (0, 1, 0, 1)
-            # del_btn.bind(
-            #     on_press=partial(
-            #         self.disableAddress if is_enable == 'true' else self.enableAddress , item['secondary_text']))
-            # carousel.add_widget(del_btn)
-            # carousel.add_widget(meny)
-            # carousel.index = 1
             self.ids.ml.add_widget(meny)
 
     def check_scroll_y(self, instance, somethingelse):
@@ -2234,6 +2218,12 @@ class IconRightSampleWidget(IRightBodyTouch, MDIconButton):
     pass
 
 
+class TimeTagRightSampleWidget(IRightBodyTouch, MDLabel):
+    """Right icon sample widget"""
+
+    pass
+
+
 class ToggleBtn(IRightBodyTouch, MDSwitch):
     """Right toggle button widget"""
     pass